summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-02-26 13:33:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-26 13:33:19 -0800
commit0a51271c8c9f22116d18ad0e8c69d01b8f23a7a8 (patch)
tree12f670ba91b8bded5a0290bdc871564d96be4966
parent8e0c0382176c8de8a20328b743a0de291c4db433 (diff)
parent952c7384bbdcc6a0da6093ce97307b007e664c64 (diff)
downloadframeworks_native-0a51271c8c9f22116d18ad0e8c69d01b8f23a7a8.zip
frameworks_native-0a51271c8c9f22116d18ad0e8c69d01b8f23a7a8.tar.gz
frameworks_native-0a51271c8c9f22116d18ad0e8c69d01b8f23a7a8.tar.bz2
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
0 files changed, 0 insertions, 0 deletions