OSDN Git Service

Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
authorBill Yi <byi@google.com>
Fri, 18 May 2018 00:03:27 +0000 (17:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 00:03:27 +0000 (17:03 -0700)
commit44042a74c768ca036ec9e422bb847e27d3d004a5
tree2df3caf8ad0cbf3368c73baf7cb130e95a3d3a3e
parent2fe6455d18dcb2e0a82378b9f2380356ba4d4fa8
parentc844ea5c96bebd5ea3aa4cf13eb9ce68782b7513
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
am: c844ea5c96

Change-Id: Iccd345fb289c4daae404186709dccd4e8fb67fd1