Commits
Dianne Hackborn authored and Android Git Automerger committed c19213ca37dM
am 1746160d: am f650447c: am a4dcf311: am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev * commit '1746160dd63e9e02d5db06a19a458bca684fa1df':
Showing diff tof08d2efc54c