OSDN Git Service

am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge...
authorJon Larimer <jlarimer@google.com>
Thu, 29 Jan 2015 18:24:20 +0000 (18:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 18:24:20 +0000 (18:24 +0000)
commitf9c9652256921eeb70484757f375aaa252f9c574
tree006ae6ee2e87de03bf7a2145fa94add644bca76d
parent8514766a0a388c3598eaa64709edc634f8edccb1
parent6959a94f372d54e63f53b8cfc98b57ce4ab0866b
am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '6959a94f372d54e63f53b8cfc98b57ce4ab0866b':
  DO NOT MERGE Restore calling identity before checking permission