From: Fan Zhang Date: Thu, 26 Apr 2018 23:49:32 +0000 (-0700) Subject: Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am: 62cd5... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f492647c89b06dc83ec4b3ea554acf1c8031dc8;p=android-x86%2Fpackages-apps-Settings.git Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am: 62cd5f7f0f am: 169d6a9cd6 Change-Id: Ie5aada5dc0993e097ad5215895bda86cebab2f87 --- 5f492647c89b06dc83ec4b3ea554acf1c8031dc8