tree 9d01f2ac2a14180f0949bdd02cb64bd070a94e04
parent 4e07468fcec44f97dffde9533b1480674dc47d86
parent 55dbf2d78e575b6c7b53e06aed17ff7406305a13
author Jason Monk <jmonk@google.com> 1438696354 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438696354 +0000

am 55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev

* commit '55dbf2d78e575b6c7b53e06aed17ff7406305a13':
  QS: Allow Flashlight Tile to handle reset state