am 64bdf77d: am 8bb65246: 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 '64bdf77d9515f587f31998b614e524c26b2415a4':
This commit is contained in:
Jon Larimer
2015-01-29 19:45:56 +00:00
committed by Android Git Automerger

Diff Content Not Available