tree 9fdcd664ca837be6734593e21f694b6d3cbf1f63
parent 6f6f44b0387c88b35d9345775a9e909ad484fe68
parent f8a2ba511ee2dc5360f323c71eff5e0f2465dd99
author Craig Mautner <cmautner@google.com> 1427148194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427148194 +0000

am f8a2ba51: Merge "Prevent unexpected rotation while going back to keyguard"

* commit 'f8a2ba511ee2dc5360f323c71eff5e0f2465dd99':
  Prevent unexpected rotation while going back to keyguard