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)
commit5897727afc3c63e3ae76b30c4a734c9736ddd6b8
tree2df3caf8ad0cbf3368c73baf7cb130e95a3d3a3e
parent60682c726cca07dbca6b73c3d9e5cb0a911ba8cc
parentea5a5f49cc96a22c9fa2df27e612fea9307ffc91
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev
am: ea5a5f49cc

Change-Id: Ib4683b9918a30e45b255e03b5dc5b38567b0bbe9