tree 5cbd5b95507d052a2f1a1bb7d6f0ac57e5779c3a
parent 91768a2bfe0bea433a93a4c98151eec011329414
parent fd43dc6723e721c41fb5e0d84258672a036cc006
author Eino-Ville Talvala <etalvala@google.com> 1497427981 +0000
committer android-build-merger <android-build-merger@google.com> 1497427981 +0000

Merge changes Ibc1444b8,I14c200d1 into oc-dev
am: fd43dc6723

Change-Id: Iae111bcc2770c1e75aba29021e31d07ff89243ab