tree f83ffc26e32b676f1479822000fc6e4ada10062c
parent 6784cf9945e01de63f67ed11a4925fa9879f2073
parent a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0
author Zach Riggle <riggle@google.com> 1426808120 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426808120 +0000

am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
  Fix NPE in FlashlightController