Commits
Craig Mautner authored and Android Git Automerger committed ff4bdd0be5bM
am 26d577b0: am f8a2ba51: Merge "Prevent unexpected rotation while going back to keyguard" * commit '26d577b08f4cbd4d44f9cfc8360849293e2f2d0c': Prevent unexpected rotation while going back to keyguard
Showing diff to2b30b73b017