Bill Yi
5e5109e304
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours
...
am: 92c5a4fafd
-s ours
am skip reason: subject contains skip directive
Change-Id: Id650db71b5de1ed86c95a02122870032118ff84b
2019-08-22 09:12:05 -07:00
Android Build Merger (Role)
fa115507c2
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours am: 32c8779c92
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-08-22 16:11:12 +00:00
Bill Yi
7f6847335c
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours
...
am: 32c8779c92
-s ours
am skip reason: subject contains skip directive
Change-Id: I2607c02aad32924424cf3c4a2c291a928869db42
2019-08-22 09:10:56 -07:00
Bill Yi
496b257e51
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: 1f8f4362c4
-s ours
...
am: 7aaf659356
-s ours
am skip reason: subject contains skip directive
Change-Id: I787acbcfe6a89991220b6a0560f8cf7aa8320f88
2019-08-22 09:10:54 -07:00
Bill Yi
836cdce5b4
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours
...
am: 32c8779c92
-s ours
am skip reason: subject contains skip directive
Change-Id: Id03ec76072cd7cf7e39133adbf7c8911c261434f
2019-08-22 09:10:53 -07:00
Bill Yi
92c5a4fafd
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: b227fad96a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie130f1213412043590b081561fa371dc98158dc7
2019-08-22 08:56:32 -07:00
Bill Yi
7aaf659356
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: 1f8f4362c4
-s ours
am skip reason: subject contains skip directive
Change-Id: I8d520cc26e8315f8bbb6eb1694547dfab1bc4e0a
2019-08-22 08:55:21 -07:00
Bill Yi
7026183341
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: b227fad96a
-s ours
am skip reason: subject contains skip directive
Change-Id: I0ad889879219af3ac9f9ccbaac40caecadd1ebef
2019-08-22 08:54:34 -07:00
Bill Yi
32c8779c92
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: b227fad96a
-s ours
am skip reason: subject contains skip directive
Change-Id: I7257f9247032fe4fe119610faf8c7df27122c365
2019-08-22 08:54:33 -07:00
Bill Yi
1f8f4362c4
[automerger skipped] Import translations. DO NOT MERGE
...
am: e6c59cd920
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib440f82e3fe673be9aaa79557166119689d7446e
2019-08-22 08:40:37 -07:00
Bill Yi
b227fad96a
[automerger skipped] Import translations. DO NOT MERGE
...
am: e6c59cd920
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0
2019-08-22 08:40:36 -07:00
TreeHugger Robot
962c472b26
Merge "Import translations. DO NOT MERGE" into qt-qpr1-sysui-dev
2019-08-22 15:03:15 +00:00
Bill Yi
fdc3164ce7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I38f3254282525e8874304943e3acd8289168d493
2019-08-22 03:52:06 -07:00
Bill Yi
f8121473ca
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I20e97f9902c0b550ca2c93a87c02243de733428b
2019-08-22 03:38:17 -07:00
SongFerng Wang
f1a5d8a08a
Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
...
am: 201fc40816
Change-Id: I76ac45fbc93bf01bbc4783fecfd3eed8b9dbb6d2
2019-08-22 03:01:21 -07:00
SongFerng Wang
332f71a9ca
Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
...
am: 201fc40816
Change-Id: I8aa46d3909e8d048b30ef17c353970d319b2a955
2019-08-22 03:01:09 -07:00
SongFerng Wang
201fc40816
Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
2019-08-22 09:49:27 +00:00
Bill Yi
e6c59cd920
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2995bfc89e4a39074ec7f05d1425054dfb39c8f6
2019-08-22 02:42:58 -07:00
android-build-team Robot
620240f004
Snap for 5821701 from 91ca872a44
to qt-c2f2-release
...
Change-Id: If14ef067b6b999603c017ab2cf810aeb4e284a86
2019-08-22 03:26:47 +00:00
Bill Yi
cb63528d1f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 1407d45e3b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie6d964bd3a2c17fdb8469ffdb63fc18c87dab93b
2019-08-21 17:25:32 -07:00
Bill Yi
bdf47db145
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 1407d45e3b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib30013c0935eb878f5d83d71b4009eef49c5820f
2019-08-21 17:23:55 -07:00
TreeHugger Robot
1407d45e3b
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-08-21 23:32:19 +00:00
Bill Yi
6ac1ded703
[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44
-s ours
...
am: 075385c12e
-s ours
am skip reason: subject contains skip directive
Change-Id: I0ca2c0114c8fdeaf006d21081f7bf51018bf83c6
2019-08-21 16:19:06 -07:00
Bill Yi
ca93f79957
[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44
-s ours
...
am: 075385c12e
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie8dffbd617990f1b7bf853be1adf2f54dbda932f
2019-08-21 16:18:33 -07:00
Bill Yi
7ef83b488d
[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44
-s ours
...
am: 1b7486fe92
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic867e1efd3ccb97bcd7bc53c3185eb8d29feeb9a
2019-08-21 16:17:47 -07:00
Bill Yi
154e1c5025
[automerger skipped] Import translations. DO NOT MERGE
...
am: 91ca872a44
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie77d935d5417155e3bb63de51aec4e03a2994d08
2019-08-21 16:15:32 -07:00
Bill Yi
1b7486fe92
[automerger skipped] Import translations. DO NOT MERGE
...
am: 91ca872a44
-s ours
am skip reason: subject contains skip directive
Change-Id: I29b799f65bf043aa22b31b363c5a1660ca28210e
2019-08-21 16:09:36 -07:00
Bill Yi
075385c12e
[automerger skipped] Import translations. DO NOT MERGE
...
am: 91ca872a44
-s ours
am skip reason: subject contains skip directive
Change-Id: I72351a3f496967c2ef6e6a4e457a4d30d5b70955
2019-08-21 16:06:39 -07:00
Bill Yi
1815f5a534
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 138829927
Change-Id: Ibebcce851f08b7cc14d8707305f2c21b29e7dfc0
2019-08-21 15:12:57 -07:00
Hyunyoung Song
bc09dd7921
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
...
am: 9f4093daef
Change-Id: I2fa81a5397c4033361e821d7d42d2c57e1c8e36f
2019-08-21 15:06:45 -07:00
Hyunyoung Song
2bf37d4da3
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
...
am: 9f4093daef
Change-Id: Ibb7e6e3ea242eeb5390ef790cba4d8a0eecf2b61
2019-08-21 15:05:24 -07:00
Hyunyoung Song
20148f679e
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
...
am: 84c67f5fd6
Change-Id: Ie612828734b6aed98b51048af9c5d98ea70f41c4
2019-08-21 14:40:45 -07:00
Hyunyoung Song
c7456de5ec
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
...
am: 84c67f5fd6
Change-Id: Id11d6e52d9ae89b9afa436323bb4a7e6ac563f15
2019-08-21 14:39:48 -07:00
TreeHugger Robot
9f4093daef
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
2019-08-21 21:19:19 +00:00
Bill Yi
91ca872a44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
2019-08-21 12:57:11 -07:00
Hyunyoung Song
84c67f5fd6
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
...
Test: presubmit setup on source branch
Change-Id: I4ff876bd5e711e04be5148008fdaa6ef29df0cbe
2019-08-21 16:05:31 +00:00
andychou
34fc2495d2
If the user add APN with empty APN type, map it for default type
...
Original behavior will map all APN type if enter empty APN type. But it
sometimes cause problem that MMS or IMS not working when select to this
custom APN. So if the user doesn't enter any APN type, just map to
valure of carrier config 'apn_settings_default_apn_types_string_array'
to avoid all the functions broken.
Bug: 129704611
Test: 1.Enter empty APN type and check if only default is added into
APN. 2.atest ApnEditorTest pass.
Change-Id: Icec274e5b402af06822479bcc60294b347f5254f
2019-08-21 21:20:49 +08:00
Goven Liu
fe3548ef41
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
...
am: cfcfb024c4
Change-Id: If72465328b970ce0d8e9d0c69f0a229a528bdbee
2019-08-20 22:36:09 -07:00
Goven Liu
b0abf92713
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
...
am: cfcfb024c4
Change-Id: I3da8cbf728bd761fd4665eef47539374a07d787c
2019-08-20 22:36:08 -07:00
Goven Liu
cfcfb024c4
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
2019-08-21 05:13:49 +00:00
govenliu
14a74125e6
[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog
...
We should set the same theme which applied in Settings APP to the NetworkRequestDialog
Bug: 139294487
Test: check if the right theme is applied when launching this activity.
Change-Id: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
Merged-In: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
2019-08-21 12:23:32 +08:00
android-build-team Robot
c394b203d8
Snap for 5817401 from ba8880dd87
to qt-c2f2-release
...
Change-Id: I9400648d5201ea6660831752332011338a392a66
2019-08-21 02:19:37 +00:00
Bill Yi
d8cce55735
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1dea02439a
-s ours
am skip reason: subject contains skip directive
Change-Id: I3aa129a38621beccec52246350313b9859428d76
2019-08-20 17:29:09 -07:00
Bill Yi
10ca16aebb
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1dea02439a
-s ours
am skip reason: subject contains skip directive
Change-Id: I88d487b3d8c48f58461e47ddc9b96eaedef311bf
2019-08-20 17:27:05 -07:00
Bill Yi
1dea02439a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I79a6c2c9db40e5198b2bbe60f23d4d2e40f5ab19
2019-08-20 15:26:43 -07:00
Bill Yi
e4f117dda7
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87
-s ours
...
am: e2f660eb6a
-s ours
am skip reason: subject contains skip directive
Change-Id: I7cf0182705e63315cecb597941c854eb796d721c
2019-08-20 14:36:38 -07:00
Bill Yi
06a0c0fe24
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87
-s ours
...
am: d9c4bdf4fb
-s ours
am skip reason: subject contains skip directive
Change-Id: I7503693d8c2bfd386c82edfcf38dd406bb1e9d03
2019-08-20 13:50:49 -07:00
Bill Yi
a42954156b
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87
-s ours
...
am: e2f660eb6a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie20613bf58588878edc8d736dbe789bff4ce3902
2019-08-20 13:49:40 -07:00
Bill Yi
d9c4bdf4fb
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic0805579cd91f4ec10fb11c34dfe3ca652a43f50
2019-08-20 13:36:38 -07:00
Bill Yi
cbedccf7ff
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
-s ours
am skip reason: subject contains skip directive
Change-Id: I3c89dde348a9f374aa78c90a1c3033a1c0fcf638
2019-08-20 13:36:37 -07:00