tree 0e54507e3c09a4d806c7e8feff6969e7d62b2df5
parent cbe9cf3eba178a59b741dd1a75c1896a77188330
parent 135bec690ddbb1b8974d90d60317c1ad1b6d935e
author Ben Chan <benchan@chromium.org> 1366910555 -0700
committer Ben Chan <benchan@chromium.org> 1366910565 -0700

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

Change-Id: Ibc50b59bc332228075fa16d9f3ba67facaaed5d4