tree b2934c9246158b2ba58d44cf366cdf2c17fc19f0
parent f2b28dac5a37018d354a6205b5086589f14691a2
parent 630ff318727280fc55eb2ed69019ed43f1802c93
author Zach Riggle <riggle@google.com> 1426808433 +0000
committer android-build-merger <android-build-merger@google.com> 1426808433 +0000

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

* commit '630ff318727280fc55eb2ed69019ed43f1802c93':
  Fix NPE in FlashlightController