OSDN Git Service

Merge "Add location as a Inline list payload" into oc-dr1-dev
authorMatthew Fritze <mfritze@google.com>
Mon, 10 Jul 2017 23:32:11 +0000 (23:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 23:32:11 +0000 (23:32 +0000)
am: 9e2984b035

Change-Id: Iad7aa04e35d7853ade051e5a711632b20b2fbcbe


Trivial merge