| commit | 76c58fa65b91cb4dceed8157f16a18474e9dbdeb | [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 | e60b700e8d8ccd177392af36d73ab65ce32fbeb8 | |
| parent | 8fe58ec47ecdb02398c244aede6110691806c8f9 [diff] | |
| parent | 47d1e009db610f138bc45f1c244c247f9232b7c2 [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':