Commits
Dianne Hackborn authored and Android Git Automerger committed 595b6565dcaM
am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on" * commit '977abbb887cfaf7cd8a0d31235281fbdd639ac19': Keep keyguard from starting after finished call when screen is on
Showing diff toabac0cd1610