OSDN Git Service

Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev
authorWale Ogunwale <ogunwale@google.com>
Thu, 6 Sep 2018 01:03:00 +0000 (18:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Sep 2018 01:03:00 +0000 (18:03 -0700)
commit5c6dd2cd0c81a26ec2b188461a314191d0a85f33
tree43043f8d29f98a4cd3932eed3ef278e90820a338
parentd55320b5240a20bccca4ad7df57e92b14c7f7d37
parent471a4e60764e704bf2b977a6e11c0c89a6b4f37a
Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev
am: 471a4e6076

Change-Id: Ie51140203150cd9ef361e713700dfef128651f4e