OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64d6bac 6813f29)
am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE...
authorJon Larimer <jlarimer@google.com>
Thu, 29 Jan 2015 18:32:05 +0000 (18:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 18:32:05 +0000 (18:32 +0000)
* commit '6813f29e3247f0567b77fe7eb451215b5fadf67b':
  DO NOT MERGE Restore calling identity before checking permission


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