tree 0c639a60cf2b9883791f39b48f2762700b53a07f
parent 140616a89c0ecadd22758e42fbca99c74773db84
parent 451b93cbb090d17f6e934e3016543aae865258a6
author Jim Miller <jaggies@google.com> 1409937511 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409937511 +0000

am 29d2611e: am c5adf557: am 8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev

* commit '29d2611eea8051c49b953b4dd3767737c50d4eaa':
  Send USER_PRESENT broadcast after keyguard animation finishes