Julia Reynolds
90d41ad625
Fix bubble tests am: 99b363fb18 am: d4045296ba
...
Change-Id: I5eef62051373d7efbeb2b1bc63629f60edef931d
2020-04-29 15:52:44 +00:00
Julia Reynolds
04b6152ef0
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
...
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
2020-04-29 15:42:46 +00:00
Julia Reynolds
c6fe4407fe
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
...
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
2020-04-29 15:42:45 +00:00
Julia Reynolds
d4045296ba
Fix bubble tests am: 99b363fb18
...
Change-Id: If84a190e7c59cdaed74c0277a2703860b85785e1
2020-04-29 15:42:00 +00:00
Julia Reynolds
8c5d6b6d5f
Fix bubble tests am: 99b363fb18
...
Change-Id: Ie06e993258c7c3069e28fb280ed24bed32675133
2020-04-29 15:41:47 +00:00
Julia Reynolds
e2eb832033
Merge "Remove unused development setting" into rvc-dev
2020-04-29 15:25:24 +00:00
TreeHugger Robot
dfa938577d
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 am: db329e92d0 am: 0ad7e5dbcf am: f2f04cb533
...
Change-Id: I29cfacf60306571b5f3dc1e2c0b3d819848fda4c
2020-04-29 14:30:53 +00:00
TreeHugger Robot
89c40714b4
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e am: 90cd472a7e am: 9d5fa99a60 am: 0127654666
...
Change-Id: I1579b1ec5a9ac777676ba2ff4a0cce8f33d79eda
2020-04-29 14:30:46 +00:00
TreeHugger Robot
64018512ed
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da am: 6faaa7caaf
...
Change-Id: I3adf38c9704dae37fa8e78ac75e0ffd466d04462
2020-04-29 14:30:39 +00:00
TreeHugger Robot
f2f04cb533
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 am: db329e92d0 am: 0ad7e5dbcf
...
Change-Id: Ic5c2508b709c0c52b5cf15f080e99112200cff2b
2020-04-29 14:18:26 +00:00
TreeHugger Robot
0127654666
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e am: 90cd472a7e am: 9d5fa99a60
...
Change-Id: I862aa7dd5dac9314779ffac7990cf15e4e90bdee
2020-04-29 14:18:19 +00:00
TreeHugger Robot
0ad7e5dbcf
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 am: db329e92d0
...
Change-Id: I00931d862378f8460c4a8d2b11a2d1a87c5c019a
2020-04-29 14:18:14 +00:00
TreeHugger Robot
6faaa7caaf
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da
...
Change-Id: I57f9070cadb4d8bed271825a66fa1076e836b0d0
2020-04-29 14:18:07 +00:00
Julia Reynolds
99b363fb18
Fix bubble tests
...
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
2020-04-29 13:58:46 +00:00
TreeHugger Robot
9d5fa99a60
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e am: 90cd472a7e
...
Change-Id: I854a85521e5c598a83adfdd45b938a51442147c9
2020-04-29 13:53:18 +00:00
TreeHugger Robot
db329e92d0
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5
...
Change-Id: I251c0cc0b18265658d10749c32596646743b17fa
2020-04-29 13:53:13 +00:00
TreeHugger Robot
bc83b982da
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075
...
Change-Id: Ia9784d8938eaa83236edcf4a05ae9e7908d211f2
2020-04-29 13:53:11 +00:00
Neil Fuller
9db267cd5c
Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 am: 6bcbd8ed89 am: d76d0c680b am: 0038c27c53 am: afd9b57581
...
Change-Id: I13e3d162e112b69fe30a1bb674f0e75894ef1a34
2020-04-29 13:50:17 +00:00
TreeHugger Robot
ea0934d5e5
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4
...
Change-Id: Id7b2d221b2409d8a4fce6ecdde55369aec488be3
2020-04-29 13:38:32 +00:00
TreeHugger Robot
90cd472a7e
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e
...
Change-Id: I054b6c61d3724fc8041fd19fb7dd8b4650cd5d50
2020-04-29 13:38:28 +00:00
TreeHugger Robot
27c76c3075
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4
...
Change-Id: I84b0ddf08b3efa97c7b082c613c18b254471c61d
2020-04-29 13:38:14 +00:00
Neil Fuller
afd9b57581
Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 am: 6bcbd8ed89 am: d76d0c680b am: 0038c27c53
...
Change-Id: Ic290062ca1314147e3412c4ca393cb2ea14bd492
2020-04-29 13:27:58 +00:00
TreeHugger Robot
d5cf3b0a5e
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
...
Change-Id: Idfd8ff9e9da16191add8c764370e20b5b6ad174f
2020-04-29 13:22:56 +00:00
TreeHugger Robot
5c6094bcf4
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
...
Change-Id: Ibc3eb51b98ea8dbb864731f92cc5a503d297d857
2020-04-29 13:22:48 +00:00
Neil Fuller
0038c27c53
Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 am: 6bcbd8ed89 am: d76d0c680b
...
Change-Id: Idfb5c5f22ecbb284adf3b476fda5d6453e3e1683
2020-04-29 13:16:54 +00:00
TreeHugger Robot
e76cdc27d0
Merge "Fix the preference index conflict problem" into rvc-dev
2020-04-29 13:01:45 +00:00
Neil Fuller
d76d0c680b
Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 am: 6bcbd8ed89
...
Change-Id: I696eafa89264541b6c98d864f8d75c2cdeb4926d
2020-04-29 12:57:22 +00:00
Neil Fuller
6bcbd8ed89
Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877
...
Change-Id: Id54f91141814eb0f1adda28f9ec72b48f434c997
2020-04-29 12:45:01 +00:00
Neil Fuller
6a19fdf877
Merge "Fix missing zone strings in some cases" am: 738df11447
...
Change-Id: I66ba5583cdd3632c6e6efb47fb1c0a0ea3b137cb
2020-04-29 12:30:24 +00:00
Neil Fuller
738df11447
Merge "Fix missing zone strings in some cases"
2020-04-29 12:18:53 +00:00
Sunny Shao
502a5eb1c5
Fix the preference index conflict problem
...
Bug: 153888035
Test: manual test
Change-Id: I6c67d2fea752487ceb5fa05c6537df980a0f8d6a
2020-04-29 11:53:55 +00:00
hoffc
991e2db389
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 am: 38495e875b -s ours am: d6c1d47dff -s ours am: 6b0dafdf90 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:19:01 +00:00
hoffc
2a6483b3c9
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours am: dbb42d1e8f -s ours am: 9c5d56cae1 -s ours am: 45d33e3240 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:18:50 +00:00
hoffc
5474dc1a90
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours am: 3bb45a9d9e -s ours am: 8190103964 -s ours am: 5c657ec406 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 11:18:39 +00:00
hoffc
6b0dafdf90
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 am: 38495e875b -s ours am: d6c1d47dff -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:04:14 +00:00
hoffc
45d33e3240
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours am: dbb42d1e8f -s ours am: 9c5d56cae1 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:04:08 +00:00
hoffc
d6c1d47dff
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 am: 38495e875b -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:03:57 +00:00
hoffc
5c657ec406
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours am: 3bb45a9d9e -s ours am: 8190103964 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 11:03:54 +00:00
hoffc
9c5d56cae1
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours am: dbb42d1e8f -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 10:49:28 +00:00
hoffc
8190103964
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours am: 3bb45a9d9e -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 10:49:11 +00:00
hoffc
38495e875b
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4
...
Change-Id: Ic0098f3f4f6301e2e783296722ac473f04bbb9dd
2020-04-29 10:49:08 +00:00
hoffc
375b565eb4
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb
...
Change-Id: I0e287cb3d0f1689679c96131e6cf90ee11e80a9c
2020-04-29 10:33:14 +00:00
hoffc
dbb42d1e8f
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 10:33:13 +00:00
hoffc
3bb45a9d9e
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 10:32:49 +00:00
SongFerng Wang
edde890918
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90 am: 966d9550f8 am: 01a23fb357
...
Change-Id: I2213737a1314e91567dd86ec5dbcc0d4f7258ce1
2020-04-29 10:12:47 +00:00
hoffc
01b5c4b51f
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 10:12:45 +00:00
hoffc
535ebae5fb
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
...
Change-Id: I1c1c3b249f938ee487dc9346bcad4c9223e2e4e7
2020-04-29 10:12:39 +00:00
SongFerng Wang
01a23fb357
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90 am: 966d9550f8
...
Change-Id: I737132d68dc11f4f8eed3780cb66e14db9ed4351
2020-04-29 09:56:59 +00:00
SongFerng Wang
966d9550f8
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90
...
Change-Id: I392df21aa7cdfeaf76801cd8204c8d74ac8c2a0b
2020-04-29 09:42:30 +00:00
Automerger Merge Worker
8115876b2f
Merge "Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1" into rvc-qpr-dev-plus-aosp am: b44f330b9e am: 0f6ddcbab8
...
Change-Id: Id9fd1fcfc37dc17bfe45dbfbcf7b1af6bc7e6f4a
2020-04-29 09:25:57 +00:00
