commit 4bf2c790b971cf43c65d8e9e5721a2a9dde474b5
author Jim Miller <jaggies@google.com> Wed Sep 25 15:44:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 25 15:44:15 2013 -0700
tree 55616dfa5766959d76ab98dcd9bac716bcda557b
parent b4d4d68795a10401e3cb50df491a2e5d5b1ac96e
parent 04b0840b2e5367547fdd92f4e2c68cde16486062

am 04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev

* commit '04b0840b2e5367547fdd92f4e2c68cde16486062':
  Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface