OSDN Git Service

Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev...
authorJason Monk <jmonk@google.com>
Thu, 6 Oct 2016 21:03:26 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 21:03:26 +0000 (21:03 +0000)
am: 80c4bc6bf0

Change-Id: If9f1a9308216cb6c45650a24de58470deb2f4097


Trivial merge