OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99b97e5 cd35e74)
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 19:43:33 +0000 (19:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:43:33 +0000 (19:43 +0000)
am: cd35e746dc  -s ours

Change-Id: I12608bbd9173dc053df967174bc59f9297a151c2


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