4646ace2d5aecc79f895d6273c928602852d7f12 - platform/frameworks/base

commit	4646ace2d5aecc79f895d6273c928602852d7f12	[log] [tgz]
author	Diego Wilson <diegowilson@google.com>	Thu Mar 22 20:39:46 2018 -0700
committer	Diego Wilson <diegowilson@google.com>	Thu Mar 22 20:39:46 2018 -0700
tree	fab215b75b0d82f84321abe76c500207cdf55c84
parent	efcb912ee02ab8bf79cf34c9dd3a183921e14836 [diff]
parent	8db271b97c68225ea93075ce60c3e9939e8390d3 [diff]

Merge remote-tracking branch 'keystone/p-fs-release' into platform_update_PPR1.180321.001

 Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/res/layout/mobile_signal_group.xml
	packages/SystemUI/res/values-zh-rCN/strings.xml
	packages/SystemUI/res/values-zh-rTW/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I927aa7099157957d2c95175e880c390ad24eea03

tree: fab215b75b0d82f84321abe76c500207cdf55c84