commit | 47d1e009db610f138bc45f1c244c247f9232b7c2 | [log] [tgz] |
---|---|---|
author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:25:48 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 29 18:25:48 2015 +0000 |
tree | 809798e1d3fdcf1bf7e4962c45a73c111e694557 | |
parent | 02cc4ac98e7b46c9cfd8c5e5213ed29bb8968b06 [diff] | |
parent | cd207c25c469a720158f2cb32ab3ad54e139c445 [diff] |
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 'f8571c8a170f0cb8341b3e2adda306bb709b824a':