OSDN Git Service

Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev
authorRyan Mitchell <rtmitchell@google.com>
Thu, 7 Jun 2018 01:30:51 +0000 (18:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 01:30:51 +0000 (18:30 -0700)
am: 075bcf73c8

Change-Id: I926986b532e52b423555f9fb6540ccfe50eee075


Trivial merge