tree 95bd104768afda39f48084ed5cdf324487a40ca5
parent fee5a860a8355cda071ff23644e943414ba7f65d
parent 54dbbce1c3cd3b534b0bf7cb15c85f966ed029b7
author Jim Miller <jaggies@google.com> 1327362572 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1327362572 -0800

Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1