summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Larimer <jlarimer@google.com>2015-01-29 18:10:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-29 18:10:34 +0000
commitf8571c8a170f0cb8341b3e2adda306bb709b824a (patch)
tree74b467e96486f4d1d4d7d734a24bf082addaebbd
parent5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2 (diff)
parent7ab0ac6927538ad3e7d09adc3524b88bfad75abc (diff)
downloadframeworks_base-f8571c8a170f0cb8341b3e2adda306bb709b824a.zip
frameworks_base-f8571c8a170f0cb8341b3e2adda306bb709b824a.tar.gz
frameworks_base-f8571c8a170f0cb8341b3e2adda306bb709b824a.tar.bz2
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
automerge: 7ab0ac6 -s ours * commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc': DO NOT MERGE Restore calling identity before checking permission
0 files changed, 0 insertions, 0 deletions