OSDN Git Service

Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
authorAdam Lesinski <adamlesinski@google.com>
Mon, 5 Jun 2017 17:54:37 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Jun 2017 17:54:37 +0000 (17:54 +0000)
commit54376bbd4bf2d899982d1e38cf5e4f5e947b02ff
tree0b3b02afc43d838f05322e06ce75d61660c8e384
parent266e587f6b5d6bb6933a47e53bede9b2c7265bc3
parent2f84c4715d2906b8b983b4c5b4ba13799e27eab5
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
am: 2f84c4715d

Change-Id: I266b8648e9aa292befa02c4e7dc0ce54f0b26e21
tools/aapt2/ResourceParser.cpp