OSDN Git Service

Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev
authorBill Yi <byi@google.com>
Mon, 1 Oct 2018 06:40:04 +0000 (23:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Oct 2018 06:40:04 +0000 (23:40 -0700)
commite90b1d120c99b726ee5a0e17b132c3df2e2f914b
treedf5002817ff3dccadf02acdfc0c0377575363479
parent3cd4a34364da4ba913b13b2cdd7dc9b765835158
parent33be0d800af582df986ebfa84e2c30e9bd623fb7
Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev
am: 33be0d800a

Change-Id: I589409d6a34ed7091fa182fad4a9d86f65970b38