commit | 074c11161aecb1e0e1fc2e5db5588ca5519e4b46 | [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 | b14af1eeebaff0c79f47d8d8089f1e3e5b2c4edd | |
parent | 336fc1fff793b2e5272f0b37cefe9ccf5dba5a53 [diff] | |
parent | f8571c8a170f0cb8341b3e2adda306bb709b824a [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':