Commits
Dianne Hackborn authored and Android Git Automerger committed 3b8ee1686beM
am 7913a867: am 5b285941: am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev * commit '7913a867a1edf65b438f111ef4becb4a0c597600': Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
Showing diff to5e16403f57f