commit | 5f787dde448f70efb6c9f073d27d3ee069e278e6 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Sat Apr 26 00:35:52 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 26 00:35:52 2014 +0000 |
tree | 34d2b4821900fec18fcb7249728b432233268680 | |
parent | b78fd071e5f127eca95b13c6aca6b218f8395b39 [diff] | |
parent | 44e89d3e2fc136f52fcdd9e0ab4384f2a744d3e2 [diff] |
am 44e89d3e: Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents" * commit '44e89d3e2fc136f52fcdd9e0ab4384f2a744d3e2': Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents