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