OSDN Git Service

Merge "Rename functions that disable status bar and keyguard" into mnc-dev
authorBenjamin Franz <bfranz@google.com>
Wed, 6 May 2015 15:16:18 +0000 (15:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 May 2015 15:16:20 +0000 (15:16 +0000)
commit94fb2024b013522e95a880e02b73886fa7d01222
treed01a10682f8ebd1d4f8864d4e99fa9902fc8416c
parent0fb5aa656e45476142c81e0cf3aa0fdd4a16af9f
parentbece80645e2b2d84ea65aabfa7fc01d5ad633708
Merge "Rename functions that disable status bar and keyguard" into mnc-dev
api/current.txt
api/system-current.txt
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java