tree 8d46becea34188953377eda7a4f6078c1f972b21
parent c4842c11932ea4f60fe7ae09b0a59660207e1587
parent 078f5919a9584cc3f1c7eb3a78862bfa40396de9
author Brian Colonna <bcolonna@google.com> 1351732535 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351732536 -0700

Merge "FUL being unsuppressed when screen turns off fixes b/7453702" into jb-mr1-lockscreen-dev