OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 989b9ab 04fe1bd)
[automerger skipped] AAPT2: Better error messages for ManifestFixer am: b2b20f26db...
authorAdam Lesinski <adamlesinski@google.com>
Mon, 21 May 2018 22:41:01 +0000 (15:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 22:41:01 +0000 (15:41 -0700)
am: 04fe1bd0de  -s ours

Change-Id: Iaa2d79b697246497c5e694ae44138be6c3b34730


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help