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)
am: 38860f2cab

Change-Id: Ief795f6cc13f5877acf0550a144c7f16aaa9a934


Trivial merge