| commit | 78d9aece821cf8f40eb95aa962cb3ea707669413 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Mar 31 19:26:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 31 19:26:14 2014 +0000 |
| tree | 8febf46597b07c703dbcdb7579049b304beab9bf | |
| parent | e6978cda7110823f70cc74319c37bd512866c6f1 [diff] | |
| parent | 46842d946d1777c22f05e6bb96933c1b5cbd00d4 [diff] |
am 46842d94: Make Keyguard trust aware * commit '46842d946d1777c22f05e6bb96933c1b5cbd00d4': Make Keyguard trust aware