tree 93e5b6c982eeb7601f61314e93cdb12142c1b90c
parent 6c78ca083c3a9d64068c945fd9998eb1e0a3e739
parent 74250cc94f0c5812d4e52db2cdcca0607fa163bb
author Ben Chan <benchan@chromium.org> 1379120549 -0700
committer Ben Chan <benchan@chromium.org> 1379120549 -0700

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