tree 74b467e96486f4d1d4d7d734a24bf082addaebbd
parent f8571c8a170f0cb8341b3e2adda306bb709b824a
parent 48dad94919c9f5027559feed3b05d8d01a03f687
author Jon Larimer <jlarimer@google.com> 1422557656 +0000
committer android-build-merger <android-build-merger@google.com> 1422557656 +0000

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
automerge: 48dad94  -s ours

* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
  DO NOT MERGE Restore calling identity before checking permission