Commits
Mike Lockwood authored and Android Git Automerger committed 7d3700fe042M
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
Showing diff to2e19c7260a2