OSDN Git Service

Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 15 Jul 2016 23:50:51 +0000 (23:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 23:50:51 +0000 (23:50 +0000)
commit3d3e2e2b1794bfed1a66e91ccec5da4e1cedef32
treef20b91516806a41dd710abaef87a69589391dc62
parent40a4bf7dc13614d3669fe277605955e3aa6b872f
parent6fa0e4d518a67380fada76bb78b4e7b697b4d7a4
Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
am: 6fa0e4d518

Change-Id: I8bc05f17694aca0c24e280daa2fcd8464aa1fd05