tree f98339f7c6bf4693377ee36281de9becc413e386
parent 84468c6e1804e44ed7a0028950b032ceb2564d2b
parent cd7b841f2b71609ac54204dc503c7bfb1029a4f8
author Ben Chan <benchan@chromium.org> 1347516693 -0700
committer Ben Chan <benchan@chromium.org> 1347516693 -0700

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

Change-Id: I4cf7e7a8a301f231f16f1ce65f9536f8a1407116