OSDN Git Service

Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev am...
authorTony Mak <tonymak@google.com>
Tue, 8 Jan 2019 12:33:52 +0000 (04:33 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Jan 2019 12:33:52 +0000 (04:33 -0800)
am: 340620b4cb

Change-Id: I9b544c70edf909ad82edf45207286168e63ffcd6


Trivial merge