tree 4501aca6e08431ed8a7651976fc49cec5335db86
parent a517dbf4b278e281c11e2ce216d783306cf4a850
parent 99cd546b9b3bf1f78964e5bd1e011c2d16229a8c
author Ben Chan <benchan@chromium.org> 1371669016 -0700
committer Ben Chan <benchan@chromium.org> 1371669016 -0700

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

Change-Id: Ie3b0f1879f0a3c8bf55b96f6f6f09ee0bd525793