OSDN Git Service

Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev am...
authorUgo Yu <ugoyu@google.com>
Fri, 10 Aug 2018 21:15:56 +0000 (14:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Aug 2018 21:15:56 +0000 (14:15 -0700)
commit8a49e7f22d2ce1283c239c958f8782407efc1f47
tree6ffe085f3bf0c38e36a9755027ffa7dce98ee0a9
parent1b9264d12835332011829bd07a50de9be5cee20c
parent23d8fb31beb09396dd34fd173937407fb4d20d76
Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev am: ab4b63e6ad
am: 23d8fb31be

Change-Id: I57612c50ca73f7bb4a1192c66976af3053eb78b7