OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52b0a46 ff6a513)
am ff6a5138: am f3fe497f: (-s ours) am b14dc048: Merge "Add new "preinstalled" permis...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 15:36:35 +0000 (15:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 15:36:35 +0000 (15:36 +0000)
* commit 'ff6a5138e998ebcaf4e4f275d00751f9de7b7470':


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