tree ae0ee9055df0adbea373928c800aa8437b01f1f8
parent 31efe43848a8b1cab5a8bae02e830aeca0878149
parent d99ae19303105ab7ba3df1907e1537157d6889e1
author Christoph Studer <chstuder@google.com> 1415026659 +0000
committer android-build-merger <android-build-merger@google.com> 1415026659 +0000

am f3aa1c8d: Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev
automerge: d99ae19

* commit 'd99ae19303105ab7ba3df1907e1537157d6889e1':
  SysUI: Use mScreenOnFromKeyguard for panel visibility