OSDN Git Service

Merge "Hook up blocked keys" into pi-dev am: a60ea38f67
authorMatthew Fritze <mfritze@google.com>
Wed, 23 May 2018 23:06:57 +0000 (16:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 May 2018 23:06:57 +0000 (16:06 -0700)
commit8e54e4a0f514d9ebb1aacab7d95c313203f1b9af
treecc0c4d0af4d424c71ef34471716d5a4461e6e906
parent270ac031265e29167f6341fae801c56e61c5e372
parenta8e1a02bfaea042d6d7f39dab736d45bbf7da57c
Merge "Hook up blocked keys" into pi-dev am: a60ea38f67
am: a8e1a02bfa

Change-Id: Ib79a5fe4721086f400477dc159e14ab5e641e304
src/com/android/settings/slices/SettingsSliceProvider.java