commit | 386ea6e0cde317872d600e0e07dd6a16541fc28f | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Mon Oct 07 17:01:12 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 17:01:12 2013 -0700 |
tree | e41553cedc6746ec3e99236b14fdaeccefc4aa2c | |
parent | e8d0f7804b9f38bb29656f8c205e1514dfe7f237 [diff] | |
parent | 62d3158f9ea4678bf2a668508ede3d7f98823a9e [diff] |
am 62d3158f: am bc015e84: am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev * commit '62d3158f9ea4678bf2a668508ede3d7f98823a9e': Disable keyguard text marquee when the display turns off.