Fan Zhang
|
16e0ef2b7d
|
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev am: 7fbfda67da
am: bbd92b5748
Change-Id: I15a40bcae625d5bacb0217c0a5f8ea16862e2fc4
|
2017-08-01 19:46:36 +00:00 |
|
Fan Zhang
|
bbd92b5748
|
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
am: 7fbfda67da
Change-Id: Idac94b7754631c7bb0c0f91e8aa17b9d300b6c30
|
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
|
4421852e12
|
Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
am: 8c3d164113 -s ours
Change-Id: Ia0dd883921e32839e6ab23f176c7547a3abe2d07
|
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 -s ours
Change-Id: I210d176201ddc67e8c5e266283bfc24f2eb57bc8
|
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 -s ours
Change-Id: Ia4847676d5300b253b85a91c4f743ee105294065
|
2017-08-01 18:18:06 +00:00 |
|
Bill Yi
|
8c0d932862
|
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
am: 23e79be08d -s ours
Change-Id: I16e397981fcc9478506ee08737ae77f1269e20ec
|
2017-08-01 18:18:03 +00:00 |
|
Bill Yi
|
f8c9a63ca6
|
Import translations. DO NOT MERGE
am: 2f525fbdc5 -s ours
Change-Id: Ie4d8ae83b68daefb3f38ee59fa961f8c127e3227
|
2017-08-01 18:14:02 +00:00 |
|
Bill Yi
|
23e79be08d
|
Import translations. DO NOT MERGE
am: 2f525fbdc5 -s ours
Change-Id: I3b6a4cfd61e7757b660657e9d2da7fe521dbf413
|
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 |
|
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
Change-Id: I18135042778eeb3bd11cfb1dd1d146c31e019a69
|
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
Change-Id: I2120ba6c52db5e012e3b467163594187c79664f1
|
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
Change-Id: I4ffacf5d6d372659e5d2d5d2a24322a8a58804b9
|
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
Change-Id: Id42693f5c0ba902f57c5c30a69ca19dba1d9e340
|
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
Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
|
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
Change-Id: Iad2c8b60c899314b5089d28b3697f7bfed9013b3
|
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 -s ours
Change-Id: I944d6ddac022e0e4e9a117f5552732df1f916f45
|
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 -s ours
Change-Id: I2ebb14c93cfbeea6ed71b8f71095eee8a1af2aad
|
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
Change-Id: I4b1ace250246896d96b2f2e5a9671c1bc33062cf
|
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
Change-Id: I7f486df805f9b6724cf8b0f432745e8024b4ea26
|
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 -s ours
Change-Id: Iba1f261e54ea5f47c99f7f29b507d9f8beec3262
|
2017-08-01 02:47:35 +00:00 |
|
jackqdyulei
|
ec1efed50f
|
Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf
am: 26e7518f76 -s ours
Change-Id: I818465ad778f1e4d1ef96f226590889cf9d2aae7
|
2017-08-01 02:47:35 +00:00 |
|
jackqdyulei
|
26e7518f76
|
Merge "Add shadow and wrapper classes" into oc-dr1-dev
am: 0782535daf
Change-Id: I9f9337b3abc97652a1105c001fbe41d15b3e262d
|
2017-08-01 02:44:11 +00:00 |
|
jackqdyulei
|
72054d6db3
|
Merge "Add shadow and wrapper classes" into oc-dr1-dev
am: 0782535daf -s ours
Change-Id: Ic4e422d73f822b6f0a11ad624bd67e79ac1b9d73
|
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
Change-Id: I0e8b1593be90aedbe54d8f04bf39cc6d537756fb
|
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
Change-Id: I083d1356461b78dec175a770643a1d52949f93e4
|
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
Change-Id: I65f2baef41c86ebcc4d6f427fa806441123621f0
|
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
Change-Id: Id37f4182ed523bbf263d6eb6c1517bbbfabf0ca4
|
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
Change-Id: I6aa1e14dce7dc18e5da209e769579bb52a6e0ba3
|
2017-08-01 01:29:42 +00:00 |
|
Fan Zhang
|
4d81c5a962
|
Merge "Update icons to match quick setting" into oc-mr1-dev
am: 687cdfb5ee
Change-Id: I2e986c8c5b1cfbdd3ee71016f46fd3084d9c35f1
|
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
Change-Id: I1e020f900c7d0ad91821a26d424b361efad45ff1
|
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 -s ours
Change-Id: Ic0fecc9e155deb05883fa3cdb645b4540060d655
|
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 -s ours
Change-Id: Ifdc0f4f85bb8d502ac06e7cd8a65e36aeee6e779
|
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
Change-Id: I9f203d14386598c0cb9c3264350564d75280e9a7
|
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 -s ours
Change-Id: Idddc9f0586e7f7ab625087bb4e4a0ab39f9296bc
|
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 -s ours
Change-Id: I096949f7c7122b1aa2ca6b9ae6f556447c2ac59d
|
2017-08-01 00:56:47 +00:00 |
|
Matthew Fritze
|
fdbf4f057b
|
Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"
This reverts commit a504291eef.
Reason for revert: <Build breaking>
Change-Id: I5da4f902d2fbcaffa44761b3f6ed8820ddb927bf
|
2017-08-01 00:51:34 +00:00 |
|
Matthew Fritze
|
9245af8ce5
|
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
am: 57992394bf
Change-Id: Ifedaad6a1a9fd628daef1d369009b3ddad2acee5
|
2017-08-01 00:45:29 +00:00 |
|
Matthew Fritze
|
da3462e366
|
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
am: 57992394bf -s ours
Change-Id: I0e4e476dc7fb83b962ba2511ccc68a0c54d54a33
|
2017-08-01 00:45:29 +00:00 |
|
Fan Zhang
|
a0a165b71a
|
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev am: 5e9b138691
am: 1f62645592
Change-Id: I8a75ba151ca17fa2225cb5f09c6c90ac8b811bf0
|
2017-08-01 00:42:41 +00:00 |
|
Fan Zhang
|
1f62645592
|
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
am: 5e9b138691
Change-Id: Ie4577a62d3bd9219dd80cd22857b2eccdd9b410f
|
2017-08-01 00:41:26 +00:00 |
|
Matthew Fritze
|
68ae06ab17
|
resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev am: a504291eef
am: 44a17e6c51
Change-Id: I59261466d74d408e75c935045984b979a4be9362
|
2017-08-01 00:39:55 +00:00 |
|