tree f6acc480ce97927d59da32b2016dd132769d9d71
parent 44edc824a99aa86aa2016d796e5a98013ce618b4
parent 5732b5518b866b3c2101739e9b223e0701a4333c
author Ben Chan <benchan@chromium.org> 1393872688 -0800
committer Ben Chan <benchan@chromium.org> 1393872688 -0800

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