tree 3adc0365990757e8397667754c19b0d5c747ab89
parent 377cfd9396a061b139f9e8cf7737ada46e28c411
parent 5b078edc214653cf28e172230e50eab1f647bbbd
author Ben Chan <benchan@chromium.org> 1386709548 -0800
committer Ben Chan <benchan@chromium.org> 1386709548 -0800

Merge remote-tracking branch 'cros/upstream' into 'cros/master'