Commits
Amith Yamasani authored and Android Git Automerger committed a87071cbd9aM
am a96ae6eb: am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev * commit 'a96ae6ebeadb111ca160968b68e51c5495cb9c23': Read in the disable-keyguard-features flag from the XML file
Showing diff toe527e11e813