OSDN Git Service

Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev
authorBill Yi <byi@google.com>
Thu, 17 May 2018 23:20:16 +0000 (16:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 May 2018 23:20:16 +0000 (16:20 -0700)
commite2790f5d0fa0079a3381fa58ab27cae7e66ca923
tree2df3caf8ad0cbf3368c73baf7cb130e95a3d3a3e
parentdc9639ab7f736f2f1a3783be2f21e52d3d845aab
parent5667f966e5500e59b1befcaa8fbed675c8de3309
Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev
am: 5667f966e5

Change-Id: Iba9987a2228227107c2870f2a57b4c132e3f6e3e