OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 074c111 48dad94)
am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63...
authorJon Larimer <jlarimer@google.com>
Thu, 29 Jan 2015 18:43:43 +0000 (18:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 18:43:43 +0000 (18:43 +0000)
* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
  DO NOT MERGE Restore calling identity before checking permission


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