| commit | 7d3700fe042781b71e2b0ce7c8d230b9fa730081 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Sat Feb 26 13:33:19 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 26 13:33:19 2011 -0800 |
| tree | cc9da8d17c584a6d624facd8165dc633803bfaba | |
| parent | 2e19c7260a28025e54bda37ffccc77c8ff2f86fe [diff] | |
| parent | 710c510b36a2d260736ca6d036365b18c86b1774 [diff] |
am 710c510b: (-s ours) am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure * commit '710c510b36a2d260736ca6d036365b18c86b1774': DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure