| commit | 1db5a8a9ffcc07e571a791e5f37cfa14fa809b2f | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Sep 01 21:19:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 01 21:19:12 2014 +0000 |
| tree | 8712b61581b5d7307b45977beddbaf2a917fe2da | |
| parent | e28a94efe1ecf5d312d29bd9ced9d214aff22228 [diff] | |
| parent | ab84dba863361492717ed9c95419805d7b2bc3af [diff] |
am 5e287457: Merge "Trust: Look at the security unlock method of the right user" into lmp-dev * commit '5e28745716363fcfad6d88651846d7c6dc4d4ea3': Trust: Look at the security unlock method of the right user