OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7824b3 caabaab)
Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd...
authorChen Xu <fionaxu@google.com>
Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)
am: caabaab8bc  -s ours

Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44


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