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)
commit288f65e3811d17273085bc5c8b553f9ba8833dd4
treecae2b644170dcb0cbd8319ec8f7527623b61581a
parentbd6f4a818ef36764eb69ef7308eb6a9bf3740138
parentfa81d2126aae262a60b194877daadfb9ed1d50da
Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev

* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon