OSDN Git Service

Merge "Move padlock to the top of the lock screen" into qt-dev
authorLucas Dupin <dupin@google.com>
Fri, 19 Apr 2019 03:16:00 +0000 (03:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Apr 2019 03:16:00 +0000 (03:16 +0000)
commit733379cc3a3535b26931347c0c95506bf3d1748f
tree718039120110a53e2a3018515b8e2ffa6023ea45
parent1f4e4e433d6a16a6c5abe4a1b1d6b3a81232c7a3
parent2e838ac0837a597f250a2b25073dc498def65364
Merge "Move padlock to the top of the lock screen" into qt-dev
packages/SystemUI/res/values/strings.xml
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java