OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 090109c 897f883)
Merge "Change protection level of companion permissions" into oc-dev
authorEugene Susla <eugenesusla@google.com>
Mon, 1 May 2017 23:32:21 +0000 (23:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 23:32:21 +0000 (23:32 +0000)
am: 897f883409

Change-Id: I5b123b603debc11a6ef0ed12a5f6da5d0c3ee533

1  2 
core/res/AndroidManifest.xml patch | diff1 | diff2 | blob | history

diff --cc core/res/AndroidManifest.xml
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help