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

* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController
This commit is contained in:
Zach Riggle
2015-03-19 23:22:10 +00:00
committed by Android Git Automerger

Diff Content Not Available