Commits
Zach Riggle authored and Android Git Automerger committed 901e400826eM
am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev * commit 'a6e7a9b50d0866fac57447496e4207d91c68c806': Fix NPE in FlashlightController
Showing diff tod5fdc287007