OSDN Git Service

Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am...
authorDoris Ling <dling@google.com>
Thu, 9 Aug 2018 19:05:08 +0000 (12:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 19:05:08 +0000 (12:05 -0700)
am: 78a7ee2f10

Change-Id: I82960fb637152698cb676fae82862408b1a2db75


Trivial merge