OSDN Git Service

Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
authorAdrian Roos <roosa@google.com>
Tue, 28 Oct 2014 15:23:12 +0000 (15:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Oct 2014 15:23:14 +0000 (15:23 +0000)
* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon


Trivial merge