OSDN Git Service

Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev
authorWyatt Riley <wyattriley@google.com>
Thu, 15 Mar 2018 22:14:04 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Mar 2018 22:14:04 +0000 (22:14 +0000)
commit4b8765ff4ae9ce67b25220dbf4d1c788d0f848b7
tree0d331bbcfb926fe826e9ba20115f742fa5fde43f
parent10dd3213437b90beec7508dd5a6ee0b3b8211c6f
parent38860f2cab7720b7f9a430877700ef6403259b0b
Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev
am: 38860f2cab

Change-Id: Ief795f6cc13f5877acf0550a144c7f16aaa9a934