OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2e2288 b4849f8)
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472
authorfionaxu <fionaxu@google.com>
Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)
am: b4849f8d74  -s ours

Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a


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