OSDN Git Service

Merge "We should show custom title for suspend app dialog" into pi-dev
authorTony Mak <tonymak@google.com>
Wed, 4 Apr 2018 10:38:18 +0000 (10:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Apr 2018 10:38:18 +0000 (10:38 +0000)
commita8c53f7dcb3092967199f0d5ed6000285401143d
tree8913bcca0cf95c5908744151538720a8953ab1f2
parent54ee35c35c3fac1710ca08a85a19305ed9b2b0b4
parentcbc3a6a1deb9993d874fe2ef894f6d3081959322
Merge "We should show custom title for suspend app dialog" into pi-dev
res/values/strings.xml
tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java