tree 5de88fb3adfbecfc2984a310f1eb8ce4a544191a
parent 219cc882c9e8d42f7ef9c2c3e2b28a7576d571c5
parent 40d040d458ec7d0fba502df7540446456883db5f
author Ben Chan <benchan@chromium.org> 1386964979 -0800
committer Ben Chan <benchan@chromium.org> 1386964979 -0800

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