OSDN Git Service

Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
authorSelim Cinek <cinek@google.com>
Tue, 5 May 2015 23:52:34 +0000 (23:52 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 May 2015 23:52:35 +0000 (23:52 +0000)
commit6329bbceebc8c0d6de164cb693a828402542fd35
tree36671db8a9145fdf11f3d928622c26aa766581b4
parent9c7ce8b0fc8e429e2524b346174cb67b59c7e175
parente70d6535237d2e6f03adcd0bdc11e45ea714dc97
Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
api/current.txt
api/system-current.txt
packages/SystemUI/res/values/strings.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java