OSDN Git Service

Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
authorFan Zhang <zhfan@google.com>
Thu, 26 Apr 2018 23:40:23 +0000 (16:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Apr 2018 23:40:23 +0000 (16:40 -0700)
am: 62cd5f7f0f

Change-Id: I52220905e7a29dfc559c32ad6322a9681e390f83


Trivial merge