tree 6ed235d1cbe08ede57116bc116e51a6f65d13fca
parent 789f0f8ea1330c66af90bd3e10f1898708e40d02
parent 8f8edb7cd388a9519423166e2614f49b99f39df5
author Ben Chan <benchan@chromium.org> 1363890823 -0700
committer Ben Chan <benchan@chromium.org> 1363890823 -0700

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