| commit | 3a96f767c3a368969a58e319ad36df5cb39b15f2 | [log] [tgz] |
|---|---|---|
| author | Zach Riggle <riggle@google.com> | Thu Mar 19 23:50:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 23:50:59 2015 +0000 |
| tree | 7deba5a4f7434c2d9e8132bbce1f238e66299bd9 | |
| parent | 4778caae5065f792bb8b70c5465362aa1ae0065c [diff] | |
| parent | 685d33dd18aba2c9ceb7586a638ec7850c1872a7 [diff] |
am 685d33dd: am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev * commit '685d33dd18aba2c9ceb7586a638ec7850c1872a7': Fix NPE in FlashlightController