OSDN Git Service

Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev
authorUgo Yu <ugoyu@google.com>
Thu, 1 Nov 2018 18:18:58 +0000 (11:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Nov 2018 18:18:58 +0000 (11:18 -0700)
commitc59c3fa0b2f7004fd3470cb844d7dab462aa04df
tree795bb7661867cbeeaea730cc8fae435a96646d78
parent8fe5c0bc2ae008a79ebb097658cc8f2646f3f1ba
parent31d6e17ffaedeae1ab42075d52e25d22c7cd8662
Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev
am: 31d6e17ffa

Change-Id: Ic9a26f8c164d74731eda6ce98c26c60395e841a3