Skip to content
Commit 288f65e3 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 

* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon
parents bd6f4a81 fa81d212
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment