tree 0d71f890cb52c2f63d5300613fb8d395c22abfe2
parent 77ad02fcc3a2bb3560f4a6a22ea558fcdfc4ff95
parent 7de9e3ea4bf12e13cd231799cb04bd8d19f718bd
author Jorim Jaggi <jjaggi@google.com> 1442457937 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442457937 +0000

am 7de9e3ea: am 09999fb9: am 18f18ae0: Allow camera launch also when device is interactive

* commit '7de9e3ea4bf12e13cd231799cb04bd8d19f718bd':
  Allow camera launch also when device is interactive