tree cd6ad7e52edc71312c7ff27b3d7b6f07f40c45a5
parent f36823cf2221b43e575eed728ba34f32c9970001
parent 836b9d1c7a7b0bba7b9b58b6d4a1929e352b3b71
author Adrian Roos <roosa@google.com> 1500560957 +0000
committer android-build-merger <android-build-merger@google.com> 1500560957 +0000

Merge changes from topic 'am-993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
am: 836b9d1c7a

Change-Id: Ifad5e11ca05f2c6d53be99871d8b40ad1b791638