tree c51e6e532df33ca8ee434d216e448cfcbde01218
parent ac2ba66c67ed9502cd5138e8e71000749301b76a
parent 48fbe1a24297d0eeb3a143230937438dc14c6109
author Ben Chan <benchan@chromium.org> 1375292342 -0700
committer Ben Chan <benchan@chromium.org> 1375292342 -0700

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

Change-Id: I102d7f36902771afb595df023e8385133da69218