OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f24e3f 937001b)
[automerger skipped] AAPT2: Differentiate between Android and Java package names...
authorAdam Lesinski <adamlesinski@google.com>
Mon, 21 May 2018 22:31:12 +0000 (15:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 22:31:12 +0000 (15:31 -0700)
am: 937001be50  -s ours

Change-Id: I52e938af2ded636732a50327662083c02274660d


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