Fan Zhang
16e0ef2b7d
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev am: 7fbfda67da
...
am: bbd92b5748
2017-08-01 19:46:36 +00:00
TreeHugger Robot
4e963f8f91
Merge "Shorten main settings battery string" into oc-mr1-dev
2017-08-01 19:45:59 +00:00
Fan Zhang
bbd92b5748
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
...
am: 7fbfda67da
2017-08-01 19:24:23 +00:00
TreeHugger Robot
7fbfda67da
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
2017-08-01 19:09:31 +00:00
Bill Yi
0c15c622ad
Import translations. DO NOT MERGE
...
Change-Id: Ie52cecfa47dc7d0a982d8f36a12b1b024bfbfd0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:32:34 -07:00
Bill Yi
0607783046
Import translations. DO NOT MERGE
...
Change-Id: I2583b083c748943ce33715d13cf2f1c5cb9591dc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:31:16 -07:00
Bill Yi
4421852e12
Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
...
am: 8c3d164113
2017-08-01 18:29:01 +00:00
Bill Yi
f0f41105ed
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: 23e79be08d -s ours
...
am: 8c0d932862
2017-08-01 18:28:35 +00:00
Android Build Merger (Role)
8c3d164113
Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
2017-08-01 18:18:27 +00:00
Bill Yi
6f76c3b39f
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
...
am: f8c9a63ca6
2017-08-01 18:18:06 +00:00
Bill Yi
8c0d932862
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
...
am: 23e79be08d
2017-08-01 18:18:03 +00:00
Bill Yi
b9fa3d1115
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64073208
Change-Id: Idb323f93239f5c66ae4fb53f37bff242d5839198
2017-08-01 11:15:13 -07:00
Bill Yi
f8c9a63ca6
Import translations. DO NOT MERGE
...
am: 2f525fbdc5
2017-08-01 18:14:02 +00:00
Bill Yi
23e79be08d
Import translations. DO NOT MERGE
...
am: 2f525fbdc5
2017-08-01 18:14:01 +00:00
Bill Yi
2f525fbdc5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64073208
Change-Id: I9ff6c2aa7d4a499617610046f74bb60b9f58a399
2017-08-01 11:03:31 -07:00
Salvador Martinez
dcb96058ef
Shorten main settings battery string
...
This string will be too long in other languages so we're shortening
it for the main settings screen.
Test: robotests updated
Bug: 64124535
Change-Id: I5ccad99b1023f84ee72a144e07b1ea60f3fc01d5
2017-08-01 10:29:44 -07:00
Meng Wang
36b430e1fa
Rephrase emergency_address_summary to remove '911'
...
Because it's not easy to translate 911 per country.
Fixes: 64226955
Test: manual
Change-Id: Ibe052090f8d33a1f3f49150fb9c0c1cc2ffb947f
2017-08-01 09:36:34 -07:00
Tony Mantler
c5dc1dc250
Merge changes from topics 'SystemPropPoker', 'DevSettingsPrefsFile'
...
* changes:
Refactor SystemPropPoker
Remove development settings prefs file
2017-08-01 16:12:14 +00:00
Geoffrey Pitsch
e80ffadd75
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313 am: cf83f9dd12
...
am: 18a5474740
2017-08-01 14:31:37 +00:00
Geoffrey Pitsch
2db7b43623
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313 am: 07052239fd
...
am: 5e6449b4f8
2017-08-01 14:26:16 +00:00
Geoffrey Pitsch
18a5474740
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
...
am: cf83f9dd12
2017-08-01 14:23:20 +00:00
Geoffrey Pitsch
5e6449b4f8
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
...
am: 07052239fd
2017-08-01 14:16:59 +00:00
Geoffrey Pitsch
cf83f9dd12
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
2017-08-01 14:08:10 +00:00
Geoffrey Pitsch
07052239fd
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
2017-08-01 14:07:37 +00:00
Geoffrey Pitsch
6d62355313
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
2017-08-01 14:00:18 +00:00
jackqdyulei
94a559eb6b
Merge "Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf am: 26e7518f76 -s ours" into oc-mr1-dev-plus-aosp
...
am: c96e9fc57d
2017-08-01 03:09:07 +00:00
jackqdyulei
c4600e3dc9
Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf -s ours am: 72054d6db3 -s ours
...
am: bc1d04ae80
2017-08-01 03:08:28 +00:00
Jeff Davidson
0454421c31
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7 am: 470c87cfea
...
am: 1034816211
2017-08-01 03:08:05 +00:00
Jeff Davidson
03c29c8089
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7 am: cebb6a4f9c
...
am: 6f95de16b5
2017-08-01 03:07:44 +00:00
Android Build Merger (Role)
c96e9fc57d
Merge "Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf am: 26e7518f76 -s ours" into oc-mr1-dev-plus-aosp
2017-08-01 02:48:04 +00:00
jackqdyulei
bc1d04ae80
Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf -s ours
...
am: 72054d6db3
2017-08-01 02:47:35 +00:00
jackqdyulei
ec1efed50f
Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf
...
am: 26e7518f76
2017-08-01 02:47:35 +00:00
jackqdyulei
26e7518f76
Merge "Add shadow and wrapper classes" into oc-dr1-dev
...
am: 0782535daf
2017-08-01 02:44:11 +00:00
jackqdyulei
72054d6db3
Merge "Add shadow and wrapper classes" into oc-dr1-dev
...
am: 0782535daf
2017-08-01 02:44:09 +00:00
Jeff Davidson
1034816211
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
...
am: 470c87cfea
2017-08-01 02:40:48 +00:00
TreeHugger Robot
0782535daf
Merge "Add shadow and wrapper classes" into oc-dr1-dev
2017-08-01 02:37:37 +00:00
Jeff Davidson
6f95de16b5
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
...
am: cebb6a4f9c
2017-08-01 02:35:01 +00:00
Jeff Davidson
cebb6a4f9c
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
...
am: cd4fbd90e7
2017-08-01 02:32:04 +00:00
Jeff Davidson
470c87cfea
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
...
am: cd4fbd90e7
2017-08-01 02:32:04 +00:00
TreeHugger Robot
cd4fbd90e7
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
2017-08-01 02:25:02 +00:00
Fan Zhang
c6f9e039df
Merge "Update icons to match quick setting" into oc-mr1-dev am: 687cdfb5ee
...
am: 4d81c5a962
2017-08-01 01:29:42 +00:00
Fan Zhang
4d81c5a962
Merge "Update icons to match quick setting" into oc-mr1-dev
...
am: 687cdfb5ee
2017-08-01 01:23:27 +00:00
TreeHugger Robot
687cdfb5ee
Merge "Update icons to match quick setting" into oc-mr1-dev
2017-08-01 01:14:35 +00:00
Matthew Fritze
54ed30e735
Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev am: 21b22f0154
...
am: 8c0d24cb6d
2017-08-01 01:13:22 +00:00
Matthew Fritze
8877bbc4d0
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am: 57992394bf -s ours am: da3462e366 -s ours
...
am: 61c338ee9a
2017-08-01 01:12:59 +00:00
Matthew Fritze
3435533240
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am: 57992394bf am: 9245af8ce5 -s ours
...
am: e79fc44426
2017-08-01 01:12:35 +00:00
Matthew Fritze
8c0d24cb6d
Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
...
am: 21b22f0154
2017-08-01 01:01:35 +00:00
Matthew Fritze
61c338ee9a
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am: 57992394bf -s ours
...
am: da3462e366
2017-08-01 01:01:12 +00:00
Matthew Fritze
21b22f0154
Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
2017-08-01 00:59:44 +00:00
Matthew Fritze
e79fc44426
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am: 57992394bf
...
am: 9245af8ce5
2017-08-01 00:56:47 +00:00
