tree 1d373b7478460a0e4aeee22dffe27f259f269cd3
parent 75caeb28310bc6a1a6e0358d2014afbc978e9b4f
parent 9bbf911f252663bf4e24d1b0910d1191c9427be3
author Michael Wright <michaelwr@google.com> 1500659614 +0000
committer android-build-merger <android-build-merger@google.com> 1500659614 +0000

Merge changes from topic 'am-5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp
am: 9bbf911f25

Change-Id: Ifece413bce768b100ac101be9335e44edee1e7d9