OSDN Git Service

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

Change-Id: I7d26255ae4369e091d077c28baaa1e4977bf6e0f


Trivial merge