OSDN Git Service

Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938...
authorMarco Nelissen <marcone@google.com>
Tue, 16 May 2017 19:52:12 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 19:52:12 +0000 (19:52 +0000)
am: e054111199

Change-Id: I2abeb0b6b9763878ae7961d96fc2014305d07f57


Trivial merge