OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6bb2ab 6d52d76)
am 6d52d761: (-s ours) am ff9912d5: Merge "Fix issue #23116383: Include security...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 10:21:50 +0000 (10:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:21:50 +0000 (10:21 +0000)
* commit '6d52d7616d339801af6caad77bc50df16df7a813':


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