OSDN Git Service

DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
authorXin Li <delphij@google.com>
Tue, 13 Aug 2019 23:36:39 +0000 (16:36 -0700)
committerXin Li <delphij@google.com>
Tue, 13 Aug 2019 23:36:39 +0000 (16:36 -0700)
commitc3ef16882d9c5f3d3f93e4b5193dd8cc62c64406
tree78cc8056e913d730e958d9d5248c37f726c3bf23
parenta64f8d95218076d5872ca3404da4e807c09ed160
parent573db8a75832a7d78dbf9f8dc4b7bd65af2e418d
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master

Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
src/com/android/settings/notification/AppNotificationSettings.java
src/com/android/settings/security/ScreenPinningSettings.java