OSDN Git Service

Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev
authorUgo Yu <ugoyu@google.com>
Fri, 10 Aug 2018 21:04:01 +0000 (14:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Aug 2018 21:04:01 +0000 (14:04 -0700)
commit23d8fb31beb09396dd34fd173937407fb4d20d76
treef5175006858d7149f53df0cfe6aff89da1c6ac6b
parent26b6a7cbf4ef67c8afc36e7bc04484db83d98732
parentab4b63e6ad4fc19530f7b8828b73e3366c2959fa
Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev
am: ab4b63e6ad

Change-Id: I510afbc60770cf5d4d272567716d2642154c94ae