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

automerge: 6fe42f0  -s ours

* commit '6fe42f08702a0773c0dd2aad2d41c54f73bb057b':
This commit is contained in:
Jon Larimer
2015-01-29 19:29:31 +00:00
committed by android-build-merger

Diff Content Not Available