tree 382ef824b3df5eef7061fb81cb24f765ba56f38b
parent 1bdbab95422e7deaaf8c4bd16822b23f82290f2c
parent db07ca24cddf8ac079a468f362d51b8044b59092
author Adam Seaton <aseaton@google.com> 1518634561 +0000
committer android-build-merger <android-build-merger@google.com> 1518634561 +0000

Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev
am: db07ca24cd

Change-Id: I738712b5f72e44b3defdb2fecca60c60a77c4433