OSDN Git Service

am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
authorZach Riggle <riggle@google.com>
Thu, 19 Mar 2015 23:22:10 +0000 (23:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Mar 2015 23:22:10 +0000 (23:22 +0000)
commit901e400826e76f0eaa9d05cca20c1696bf86db67
treee0e0bf7672474c869ef4e24c4e6f2973dd762aed
parentd5fdc2870079876cd5d8407773aa73225a12c044
parenta6e7a9b50d0866fac57447496e4207d91c68c806
am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController