tree 85fe933bcc53d6421bec4ccc1d5cfe114210fb12
parent 3919a491975274d8ba062d8aea2267712cb52c84
parent 98065ca4fdbbecdf42473bbdc1b1a4358b747918
author Alex Deymo <deymo@google.com> 1472152798 +0000
committer android-build-merger <android-build-merger@google.com> 1472152798 +0000

Fix downstream Chrome OS build. am: a2ea1c2865
am: 98065ca4fd

Change-Id: Ic218cdc65a40e2a61485fa255c3443624fbc308f