Commits
Jon Larimer authored and Android Git Automerger committed 6814e1a3e14M
am 1b570538: (-s ours) am 95b85c15: am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours automerge: 3308ad4 -s ours * commit '1b5705386aed3135526ffe7c3f7b460ad944bcb3':
Showing diff to8866ada112e