OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 266e587 2f84c47)
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)
am: 2f84c4715d

Change-Id: I266b8648e9aa292befa02c4e7dc0ce54f0b26e21

1  2 
tools/aapt2/ResourceParser.cpp patch | diff1 | diff2 | blob | history

diff --cc tools/aapt2/ResourceParser.cpp
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help