tree 809798e1d3fdcf1bf7e4962c45a73c111e694557
parent 02cc4ac98e7b46c9cfd8c5e5213ed29bb8968b06
parent cd207c25c469a720158f2cb32ab3ad54e139c445
author Jon Larimer <jlarimer@google.com> 1422555948 +0000
committer android-build-merger <android-build-merger@google.com> 1422555948 +0000

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':