tree f0009e7294e6afd37a0b1d0c69da8b16d24f20b0
parent fbd67fec87e425cfbbd80926cec8cd345d134b4c
parent 8719c406c3db17842d9350c1f6611f088d105f38
author Mike Lockwood <lockwood@android.com> 1298755288 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298755288 -0800

am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure

* commit '8719c406c3db17842d9350c1f6611f088d105f38':
  DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure