summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Larimer <jlarimer@google.com>2015-01-29 18:36:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 18:36:55 +0000
commit48dad94919c9f5027559feed3b05d8d01a03f687 (patch)
tree6c479c7f59659020f111a00f80dbf1afbab5a9bd
parent7ab0ac6927538ad3e7d09adc3524b88bfad75abc (diff)
parenta43742ec620cb11faffa2c2b1847dc1accce5736 (diff)
downloadframeworks_base-48dad94919c9f5027559feed3b05d8d01a03f687.zip
frameworks_base-48dad94919c9f5027559feed3b05d8d01a03f687.tar.gz
frameworks_base-48dad94919c9f5027559feed3b05d8d01a03f687.tar.bz2
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit 'a43742ec620cb11faffa2c2b1847dc1accce5736': DO NOT MERGE Restore calling identity before checking permission
0 files changed, 0 insertions, 0 deletions