OSDN Git Service

Merge "Show notification when network logging is enabled"
authorPhilipp Weiß <phweiss@google.com>
Tue, 20 Dec 2016 15:58:40 +0000 (15:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Dec 2016 15:58:44 +0000 (15:58 +0000)
commitcbe76a0f1e83f74648ea24a9e8bd4814f9d87c8c
treec56e1515f954c49cdbbf9fc959b9f388c62b61c6
parent19e2fb57c9ad5788253543cd2e3a8e8f4a72d61f
parenta0cb251ca6a8ea8df17ff8089573bc50f2f1849f
Merge "Show notification when network logging is enabled"
core/java/android/app/admin/DevicePolicyManager.java
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java