OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39fe023 c617a8e)
am c617a8ee: am d4d60217: (-s ours) am 97cf0f1d: Merge "Revert "Revert "Security...
authorCarlos Valdivia <carlosvaldivia@google.com>
Thu, 27 Aug 2015 16:39:04 +0000 (16:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:39:04 +0000 (16:39 +0000)
* commit 'c617a8eede4960c1c899cd49fd4000e772695862':


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