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)
am: 471a4e6076

Change-Id: Ie51140203150cd9ef361e713700dfef128651f4e


Trivial merge