commit | 1b5705386aed3135526ffe7c3f7b460ad944bcb3 | [log] [tgz] |
---|---|---|
author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:50:11 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 29 18:50:11 2015 +0000 |
tree | a0c3ff70b6a365bc911f442c8d867a80892a7ac2 | |
parent | 143ac135dcf85b899ae387be2f13401ecd43f08b [diff] | |
parent | 3308ad42fa162fbdda26337f64e00603b1388ec7 [diff] |
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 '3308ad42fa162fbdda26337f64e00603b1388ec7':