Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

diff --cc src/com/android/settings/DeviceInfoSettings.java
index 7637fab,39eaa5a..522968b
--- 1/src/com/android/settings/DeviceInfoSettings.java
--- 2/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@@ -102,9 -92,9 +105,10 @@@ public class DeviceInfoSettings extend
      private static final String KEY_MOD_BUILD_DATE = "build_date";
      private static final String KEY_MOD_API_LEVEL = "mod_api_level";
      private static final String KEY_CM_UPDATES = "cm_updates";
 +    private static final String KEY_DEVICE_MANUFACTURER = "device_manufacturer";
  
      static final int TAPS_TO_BE_A_DEVELOPER = 7;
+     static final int TAPS_TO_SHOW_DEVICEID = 7;
  
      long[] mHits = new long[3];
      int mDevHitCountdown;