OSDN Git Service

Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev
authorBill Yi <byi@google.com>
Thu, 17 May 2018 23:36:39 +0000 (16:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 May 2018 23:36:39 +0000 (16:36 -0700)
am: ea5a5f49cc

Change-Id: Ib4683b9918a30e45b255e03b5dc5b38567b0bbe9


Trivial merge