Merge remote-tracking branch 'origin/upstream-master' into masterHEADstudio-3.4.0studio-3.2.1studio-3.1.2studio-3.0studio-2.3gradle_3.4.0gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devmirror-goog-studio-master-devmastermain

Change-Id: I63f5e16d09297c48432192761b840310935eb903

1 files changed, 169 insertions, 0 deletions

diff --git a/WordPress/src/main/assets/android_models.properties b/WordPress/src/main/assets/android_models.properties
new file mode 100644
index 000000000..e0fe425c1
--- /dev/null
+++ b/WordPress/src/main/assets/android_models.properties
@@ -0,0 +1,169 @@
+ADR6300             = HTC Droid Incredible
+ADR6330VW           = HTC Rhyme
+ADR6350             = HTC Droid Incredible 2
+ADR6400L            = HTC Thunderbolt
+ADR6410LVW          = HTC Droid Incredible 4G
+ADR6425LVW          = HTC Rezound 4G
+ASUS_Transformer_Pad_TF300T= Asus Transformer Pad
+Desire_HD           = HTC Desire HD
+D800 				= LG G2
+D801 				= LG G2 
+D802 				= LG G2
+D802TA 				= LG G2
+D803  				= LG G2
+D800_4G  			= LG G2
+D801_4G  			= LG G2
+D802_4G     		= LG G2
+D802TA_4G			= LG G2
+D803_4G 			= LG G2
+DROID2_GLOBAL       = Motorola Droid 2 Global
+DROID2              = Motorola Droid 2
+DROID3              = Motorola Droid 3
+DROID4              = Motorola Droid 4
+DROID_BIONIC        = Motorola Droid Bionic
+Droid               = Motorola Droid
+DROID_Pro           = Motorola Droid Pro
+DROID_RAZR          = Motorola Droid Razr
+DROID_X2            = Motorola Droid X2
+DROIDX              = Motorola Droid X
+EVO                 = HTC Evo
+Galaxy_Nexus        = Samsung Galaxy Nexus
+google_sdk          = Android Emulator
+GT-I9000            = Samsung Galaxy S
+GT-I9100M           = Samsung Galaxy S II
+GT-I9100            = Samsung Galaxy S II
+GT-I9100T           = Samsung Galaxy S II
+GT-I9300            = Samsung Galaxy S III
+GT-I9500			= Samsung Galaxy S4
+GT-I9502			= Samsung Galaxy S4
+GT-I9505			= Samsung Galaxy S4
+GT-I9506			= Samsung Galaxy S4
+GT-I9508			= Samsung Galaxy S4
+GT-I9500G			= Samsung Galaxy S4
+GT-I9505G			= Samsung Galaxy S4
+GT-I9506G			= Samsung Galaxy S4
+GT-I9508G			= Samsung Galaxy S4
+GT-N7000            = Samsung Galaxy Note
+GT-N7100            = Samsung Galaxy Note II
+GT-N7102            = Samsung Galaxy Note II
+GT-N7105            = Samsung Galaxy Note II
+GT-N7108            = Samsung Galaxy Note II
+GT-N9005            = Samsung Galaxy Note III
+N9005               = Samsung Galaxy Note III
+GT-N9006            = Samsung Galaxy Note III
+N9006               = Samsung Galaxy Note III
+GT-P3113            = Samsung Galaxy Tab 2 7.0
+GT-P7510            = Samsung Galaxy Tab 10.1
+GT-S5830            = Samsung Galaxy Ace
+HTC_Amaze_4G        =
+HTC_Desire          = 
+HTC_Desire_HD_A9191 = HTC Desire HD
+HTC_Desire_S        = 
+HTCEVOV4G           = HTC Evo V 4G
+HTC_Glacier         = 
+HTC_Incredible_S    = 
+HTC_One_S           = 
+HTC_One_X           = 
+HTC_PH39100         = HTC Vivid 4G
+HTC_Sensation_4G    = 
+HTC_Sensation_Z710e = HTC Sensation
+HTC_VLE_U           = HTC One S
+KFJWA               = Kindle Fire HD 8.9
+KFJWI               = Kindle Fire HD 8.9
+KFOT                = Kindle Fire
+KFTT                = Kindle Fire HD 7
+Kindle_Fire         =
+LG-C800             = LG myTouch Q
+LG-E739             = LG MyTouch e739
+LGL55C              = LG LGL55C
+LG-MS910            = LG Esteem
+LG-P509             = LG Optimus T
+LG-P880             = LG Optimus 4X HD
+LG-P999             = LG G2X P999
+LG-VM696            = LG Optimus Elite
+LS670               = LG Optimus S
+LS980  				= LG G2
+LS980_4G			= LG G2
+MB855               = Motorola Photon 4G
+MB860               = Motorola Atrix 4G
+MB865               = Motorola Atrix 2
+Motorola_Electrify  = 
+MOTWX435KT          = Motorola Triumph
+myTouch_4G_Slide    = HTC myTouch 4G Slide
+N860                = ZTE Warp N860
+Nexus_7             = Asus Nexus 7
+Nexus_S_4G          = Samsung Nexus S 4G
+Nexus_S             = Samsung Nexus S
+PantechP9070        = Pantech Burst
+PC36100             = HTC Evo 4G
+PG06100             = HTC EVO Shift 4G
+PG86100             = HTC Evo 3D
+PH44100             = HTC Evo Design 4G
+SAMSUNG-SGH-I717    = Samsung Galaxy Note
+SAMSUNG-SGH-I727    = Samsung Skyrocket
+SAMSUNG-SGH-I747    = Samsung Galaxy S III
+SAMSUNG-SGH-I777    = Samsung Galaxy S II
+SAMSUNG-SGH-I897    = Samsung Captivate
+SAMSUNG-SGH-I927    = Samsung Captivate Glide
+SAMSUNG-SGH-I997    = Samsung Infuse 4G
+SCH-I405            = Samsung Stratosphere
+SCH-I500            = Samsung Fascinate
+SCH-I510            = Samsung Droid Charge
+SCH-I535            = Samsung Galaxy S III
+SCH-I545			= Samsung Galaxy S4
+SCH-I605            = Samsung Galaxy Note II
+SCH-I800            = Samsung Galaxy Tab 7.0
+SCH-I959			= Samsung Galaxy S4
+SCH-N719            = Samsung Galaxy Note II
+SCH-R720            = Samsung Admire
+SCH-R950            = Samsung Galaxy Note II
+SCH-R970			= Samsung Galaxy S4
+SGH-I317            = Samsung Galaxy Note II
+SAMSUNG-SGH-I317    = Samsung Galaxy Note II
+SGH-I317M           = Samsung Galaxy Note II
+SGH-I337			= Samsung Galaxy S4
+SGH-I727R           = Samsung Galaxy S II
+SGH-I747M           = Samsung Galaxy S III
+SGH-M919			= Samsung Galaxy S4
+SGH-N025            = Samsung Galaxy Note II
+SGH-N045			= Samsung Galaxy S4
+SGH-T679            = Samsung Exhibit II
+SGH-T769            = Samsung Galaxy S Blaze
+SGH-T959            = Samsung Galaxy S Vibrant
+SGH-T959V           = Samsung Galaxy S 4G
+SGH-T989            = Samsung Galaxy S II
+SGH-T989D           = Samsung Galaxy S II
+SGH-T999            = Samsung Galaxy S III
+SGH-T889            = Samsung Galaxy Note II
+SGH-T889v           = Samsung Galaxy Note II
+SHV-E250K           = Samsung Galaxy Note II
+SHV-E250L           = Samsung Galaxy Note II
+SHV-E250S           = Samsung Galaxy Note II
+SM-N900A            = Samsung Galaxy Note III
+SM-N900P            = Samsung Galaxy Note III
+SM-N900R4           = Samsung Galaxy Note III
+SM-N900T            = Samsung Galaxy Note III
+SM-N900V            = Samsung Galaxy Note III
+SM-T210             = Samsung Galaxy Tab 3 7.0
+SM-T210R            = Samsung Galaxy Tab 3 7.0
+SPH-D600            = Samsung Conquer 4G
+SPH-D700            = Samsung Epic 4G
+SPH-D710            = Samsung Epic
+SPH-L710            = Samsung Galaxy S III
+SPH-L720			= Samsung Galaxy S4
+SPH-L900            = Samsung Galaxy Note II
+SPH-M930BST         = Samsung Transform Ultra
+SPH-R970			= Samsung Galaxy S4
+T-Mobile_G2         = 
+Transformer_Prime_TF201= Asus Eee Pad Transformer Prime
+Transformer_TF101   = Asus Eee Pad Transformer
+VM670               = LG Optimus V
+VS840_4G            = LG Lucid 4G
+VS910_4G            = LG Revolution 4G
+VS920_4G            = LG Spectrum 4G
+VS980 				= LG G2
+VS980_4G			= LG G2
+Xoom                = Motorola Xoom
+XT897               = Motorola Photon Q 4G LTE
+XT907               = Motorola DROID RAZR M
+XT1058              = Motorola Moto X
\ No newline at end of file