| commit | 1101c1eb1a2c670bee7689587504de34d0306882 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 08 15:58:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 15:58:23 2013 -0700 |
| tree | 8bb4b28e8b48e7df931cd0594b1b61fc552a0aa1 | |
| parent | a5fdea7189239d7edeafa528c299306cba55e6c6 [diff] | |
| parent | 1c39fdcd9eb628338d7f273e43723585ca35721a [diff] |
am 1c39fdcd: merge in KQS81M * commit '1c39fdcd9eb628338d7f273e43723585ca35721a': Only check caller when deriving permissions. Fix recursive locking bug.