OSDN Git Service

Merge "AAPT2: Parse an ID encoded as a map" into oc-dev
authorAdam Lesinski <adamlesinski@google.com>
Thu, 30 Mar 2017 00:36:24 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 00:36:24 +0000 (00:36 +0000)
commit719349cdb34f9d15654fc71f05c5bf6b2dddafcd
treeb1473e93d94dc1f5a59ea1bc5bfa0103f87c2f8b
parent78b5fad19ecdf9ffaa171f9d1aa11979c39d8e63
parentc26ace07545e5dfb830e9ea22bcdaf409acff627
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev
am: c26ace0754

Change-Id: I5e2aba17860b27cd5f27d4b73c65775a74630881