OSDN Git Service

Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev...
authorAdam Lesinski <adamlesinski@google.com>
Mon, 5 Jun 2017 18:11:09 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Jun 2017 18:11:09 +0000 (18:11 +0000)
am: 54376bbd4b  -s ours

Change-Id: I112b98965ed2004b1ef4ff19c7772b4ce10c4702


Trivial merge