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