Commits
Adam Powell authored and Android Git Automerger committed aa2800b286eM
am 76fe94c0: am 82da5b17: am c0657fb3: Integrate changes from lockscreen proto app * commit '76fe94c067b68347ada44f14aec713411e4b2753': Integrate changes from lockscreen proto app
Showing diff to7d5187593c7