OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e27984 e04822d)
DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851...
authorfionaxu <fionaxu@google.com>
Thu, 30 Jun 2016 23:58:26 +0000 (23:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Jun 2016 23:58:26 +0000 (23:58 +0000)
am: e04822dbd3  -s ours

Change-Id: I3f1e30bf2a2629725822536326d8e99296e093bd


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