OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfad065 cf93b96)
[automerger skipped] Merge "Move SettingsLib tests and EasterEgg to aapt2." am: 846fb...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Mon, 7 May 2018 23:03:17 +0000 (16:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 May 2018 23:03:17 +0000 (16:03 -0700)
am: cf93b96726  -s ours

Change-Id: Icb78b81f8e7bc49e2925bf690ce6f0e18f45e955


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