tree c7b41d8288799ed7ea2b1518df4e76a92d8c39f9
parent ee051608f0018abbcc4ff14bc91562c51544018d
parent 6fb83b5e029134ab9844f05517a444f2df501773
author Ben Chan <benchan@chromium.org> 1423613680 -0800
committer Ben Chan <benchan@chromium.org> 1423613680 -0800

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