| commit | 6814e1a3e14f86c924aa5c084ee0524de3fa597c | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:56:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:56:29 2015 +0000 |
| tree | 70003cff836496bf1001e1ea8ef3a6cd3544a705 | |
| parent | 8866ada112e877385b8aa2006bdedcf2e9e5e7df [diff] | |
| parent | 1b5705386aed3135526ffe7c3f7b460ad944bcb3 [diff] |
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':