| commit | 885cb6877c303a91538351c17fcc45222784495b | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Wed Oct 09 09:12:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 09:12:49 2013 -0700 |
| tree | 4220e3bb8f97d7801ccd30c02d0af2511b1cc827 | |
| parent | eef6fca832c7270dfe48a9bb2aad632bba3d0ea8 [diff] | |
| parent | 1101c1eb1a2c670bee7689587504de34d0306882 [diff] |
am 1101c1eb: am 1c39fdcd: merge in KQS81M * commit '1101c1eb1a2c670bee7689587504de34d0306882': Only check caller when deriving permissions. Fix recursive locking bug.