commit | 9a2793e0ba11336b57457cde0d6dbc3628e853ed | [log] [tgz] |
---|---|---|
author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:33:34 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:33:34 2015 +0000 |
tree | a8d9063287cd4daebbcd94f89db40f62a4164b0d | |
parent | 6959a94f372d54e63f53b8cfc98b57ce4ab0866b [diff] | |
parent | 074c11161aecb1e0e1fc2e5db5588ca5519e4b46 [diff] |
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 * commit '074c11161aecb1e0e1fc2e5db5588ca5519e4b46':