Merge "Add config to disallow the battery % option" into pi-dev am: a063da83f1

am: 2272f08724

Change-Id: I4de78fe137ed23012f13447d9460bfe19916df33

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index 61784fa,81dd5eb..3ac6705
--- 1/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
--- 2/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@@ -55,9 -55,8 +55,10 @@@ import com.android.systemui.statusbar.p
  import com.android.systemui.tuner.TunerService;
  import com.android.systemui.tuner.TunerService.Tunable;
  import com.android.systemui.util.Utils.DisableStateTracker;
+ import com.android.systemui.R;
  
 +import java.io.FileDescriptor;
 +import java.io.PrintWriter;
  import java.text.NumberFormat;
  
  public class BatteryMeterView extends LinearLayout implements

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
Simple merge