OSDN Git Service

Merge "AAPT2: Fix string escaping" into oc-dev
authorAdam Lesinski <adamlesinski@google.com>
Sat, 29 Apr 2017 21:08:47 +0000 (21:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 21:08:47 +0000 (21:08 +0000)
commit349b647b75f99e19b9199e477f11e447042fefbd
tree33d36a6c079a2e7caf44c6d3ed54bc3ad4ec965f
parent66534ef01c1762f4cae5cb0e4dc26920eb465627
parentf6bc1402edc3ec78931a6c331a2cee5fb91727c9
Merge "AAPT2: Fix string escaping" into oc-dev
am: f6bc1402ed

Change-Id: I31f0c21dcf391384759e71112957ccdc281965d3