commit | 4a99019d66879cc7523aa9cbbb355b5bafdc272d | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Tue Oct 15 18:48:37 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 15 18:48:37 2013 -0700 |
tree | 7d86acc91276cb943cb4897cc2e335d482adff1e | |
parent | 3e41d9bf41480f9e36c8af6e99d2be81b56f989a [diff] | |
parent | 1af10256cd07c2c096e22038379210866dff82a2 [diff] |
am 1af10256: am cb13a546: am 49b6d38f: Merge "Fix dodgy states of keyguard transport controls" into klp-dev * commit '1af10256cd07c2c096e22038379210866dff82a2': Fix dodgy states of keyguard transport controls