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