Automerger Merge Worker
8c7425973d
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010 am: 8965b8677b am: 3ef781bae5
...
Change-Id: I7d767aff435a3a4ce2eec7c878d91a2272309c94
2020-03-16 19:08:13 +00:00
Automerger Merge Worker
055242cd55
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603 am: 894c3dc565 am: 341fcc9afb
...
Change-Id: Ib5910e2106d29f3f676e87377051c35bbc1b5116
2020-03-16 19:08:03 +00:00
Automerger Merge Worker
34274b10ac
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp am: 6d4df5ece8 -s ours am: c3955a98d0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I455dd3ecbe2291182a138724a677c5a7ce9155e5
2020-03-16 19:08:03 +00:00
Automerger Merge Worker
f022b89e4d
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours am: 4629097190 -s ours am: fb39e01364 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iabcd5c6cf1befd4756cfee654d0c5f6a3041f979
2020-03-16 19:07:51 +00:00
Automerger Merge Worker
1ca59537cc
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours am: 624190cb2a -s ours am: 44067999f6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I105eefcef6e7274c318abd4a11bda9b03d0bd723
2020-03-16 19:07:51 +00:00
Automerger Merge Worker
341fcc9afb
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603 am: 894c3dc565
...
Change-Id: Ia9cbc8c3bd79e2f9b17ed509d5c16e4050e8107e
2020-03-16 18:57:04 +00:00
Automerger Merge Worker
612a7fd595
Merge "Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603" into rvc-d1-dev-plus-aosp am: ea3d48855c
...
Change-Id: I8597d6c3635c2753526218ecc315720f0b7fce1a
2020-03-16 18:57:01 +00:00
TreeHugger Robot
b2c35f7fcc
Merge "Do not finish early if caller is SUW" into rvc-dev
2020-03-16 18:56:54 +00:00
Automerger Merge Worker
3ef781bae5
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010 am: 8965b8677b
...
Change-Id: I80a79e40e6a1f5bbd03d7144ce79ab9defad02e4
2020-03-16 18:56:38 +00:00
Automerger Merge Worker
fb39e01364
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours am: 4629097190 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2358abc58f9203a9dfe75d99649e09ca7a4b11c3
2020-03-16 18:55:59 +00:00
Automerger Merge Worker
c3955a98d0
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp am: 6d4df5ece8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6525cece7ed4080aad179606e6b6d2368e6c5062
2020-03-16 18:55:58 +00:00
Automerger Merge Worker
44067999f6
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours am: 624190cb2a -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id1e73931f1167535f85d6b76d494de439864247a
2020-03-16 18:55:34 +00:00
Automerger Merge Worker
894c3dc565
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603
...
Change-Id: I0734d11a825d521825f474c17137058eb33f128c
2020-03-16 18:43:03 +00:00
Automerger Merge Worker
ea3d48855c
Merge "Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603" into rvc-d1-dev-plus-aosp
2020-03-16 18:42:57 +00:00
Automerger Merge Worker
4629097190
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic1e70e00fe7273b71d5e2e45c407d1f0a750ef7a
2020-03-16 18:42:56 +00:00
Automerger Merge Worker
015ea725f6
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603
...
Change-Id: I8fcd965aed01fddb516eb6bb1b99486331dff0c9
2020-03-16 18:42:53 +00:00
Automerger Merge Worker
8965b8677b
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010
...
Change-Id: I639eaa2d87eb80b5b4b12779dc2750445c9f9a84
2020-03-16 18:42:49 +00:00
Automerger Merge Worker
6d4df5ece8
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp
2020-03-16 18:42:22 +00:00
Automerger Merge Worker
e4258d5c03
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I140b938dff8b500f6807a36ce8ffe81a28cbc473
2020-03-16 18:42:18 +00:00
Automerger Merge Worker
624190cb2a
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie14b440004aa649b06f10834e80316cee2a99348
2020-03-16 18:42:14 +00:00
Automerger Merge Worker
d3b8d8c603
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf
...
Change-Id: I9b3494582be6e8e3563dc75e59ed8d921b834475
2020-03-16 18:26:26 +00:00
Automerger Merge Worker
7486f6a010
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf
...
Change-Id: I592406722b54ca059e4159826edff6d453802db2
2020-03-16 18:25:34 +00:00
Automerger Merge Worker
c4e391ad7c
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie8de471415f4dd47fe4da433648cda9c173848b9
2020-03-16 18:25:25 +00:00
Automerger Merge Worker
4768304de8
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours
...
am skip reason: subject contains skip directive
Change-Id: If219277f2764d85a82482fd2c8782bf6caa1a3c7
2020-03-16 18:24:32 +00:00
TreeHugger Robot
6c9cad2caf
Merge "Update NLS/NAS warning text" into rvc-dev
2020-03-16 18:10:09 +00:00
Automerger Merge Worker
0a9e463fff
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6e10c86bf149e6eae1e1efbc00da7ec2e0e86c88
2020-03-16 18:09:37 +00:00
Kevin Chyn
e6bcc49eb9
Do not finish early if caller is SUW
...
Fixes: 151576034
Test: Wipe device, go past fingerprint enrollment in SUW, press
back button. SUW should not get stuck
Change-Id: I9021946dd169acfa205e6bacc4c4581242452983
2020-03-16 09:32:41 -07:00
Bill Yi
d49c677499
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
2020-03-16 08:20:15 -07:00
Automerger Merge Worker
d2041011b9
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e am: 875cb73df7 am: e0404845b8 am: 92b4ccd30c
...
Change-Id: I8a6aed0e041c29226d1ae22acf5386ddaf623ee4
2020-03-16 14:34:32 +00:00
Automerger Merge Worker
2d57cb53c8
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 5a67d16648 am: 9e93eba585 am: 3dc096bc42
...
Change-Id: I47af353a59497ab704c76a6873a1052578589069
2020-03-16 14:34:17 +00:00
Automerger Merge Worker
e063941658
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e am: 18ae0b78a2 am: 12d3bc0dd7
...
Change-Id: I022e38b83aff401c05c5d65f1c8148be5e53ed2a
2020-03-16 14:34:02 +00:00
Automerger Merge Worker
6c037d9841
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: a692d719cb am: 1019cb702d am: d55db3a65a
...
Change-Id: I78669a2be27c35fe2c70a7b5855c45ea45fa07bf
2020-03-16 14:33:27 +00:00
Automerger Merge Worker
a29fbc9a73
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: b32674e24f am: 5a0f0de777 am: e4197c4a5d
...
Change-Id: If9884bc5964f274a402da5be1d875cd0eee59b9e
2020-03-16 14:32:50 +00:00
Automerger Merge Worker
92b4ccd30c
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e am: 875cb73df7 am: e0404845b8
...
Change-Id: Id7d30e3d5bbfcb6333d29fde7aa2561090d74095
2020-03-16 14:32:29 +00:00
Automerger Merge Worker
3dc096bc42
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 5a67d16648 am: 9e93eba585
...
Change-Id: Icbdbdaa1b4cc673585494f2b872444e84ef80734
2020-03-16 14:32:20 +00:00
Automerger Merge Worker
ba861466e8
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 1eedf27e67 am: 9586c26f3d
...
Change-Id: I284375f76e39aeca2d08245d05235f8e4414abf8
2020-03-16 14:31:43 +00:00
Automerger Merge Worker
12d3bc0dd7
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e am: 18ae0b78a2
...
Change-Id: I306ff6175b26d7a18c6888b92292198378a9b675
2020-03-16 14:13:12 +00:00
Automerger Merge Worker
e0404845b8
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e am: 875cb73df7
...
Change-Id: I6f6823259b72fa79f5aed85427ba6f7852114d4f
2020-03-16 14:13:03 +00:00
Automerger Merge Worker
d55db3a65a
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: a692d719cb am: 1019cb702d
...
Change-Id: I2780f5d544ee8b61f3e39c11411be8c772844e92
2020-03-16 14:12:55 +00:00
Automerger Merge Worker
e4197c4a5d
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: b32674e24f am: 5a0f0de777
...
Change-Id: I439c2db76153a35421dc641ffdb4e14590932363
2020-03-16 14:12:36 +00:00
Automerger Merge Worker
9586c26f3d
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 1eedf27e67
...
Change-Id: I34e6eafa602db3a9f3a80439adaba116a7423501
2020-03-16 14:11:27 +00:00
Automerger Merge Worker
9e93eba585
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 5a67d16648
...
Change-Id: Ibe57b13885a10baeb3bc388c8d7e6a7b0c8071c1
2020-03-16 14:11:16 +00:00
Automerger Merge Worker
875cb73df7
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e
...
Change-Id: I75c4fd88132b994e36adbb776f7b8a57a7f34cb3
2020-03-16 13:57:03 +00:00
Automerger Merge Worker
18ae0b78a2
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e
...
Change-Id: I7a6621f5d52612be031382a990f3e1d2c13af5f1
2020-03-16 13:57:01 +00:00
Automerger Merge Worker
1019cb702d
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: a692d719cb
...
Change-Id: I28b0ac25eaa256f09767ac47e488f32d67d7eacf
2020-03-16 13:56:51 +00:00
Automerger Merge Worker
5a0f0de777
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: b32674e24f
...
Change-Id: I2a5d5dddadef629572f3b10a64ca3d17dbb0e298
2020-03-16 13:56:31 +00:00
Automerger Merge Worker
5a67d16648
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3
...
Change-Id: I87a5cbc54cb9603157b1abf1b8a8d48551db25e5
2020-03-16 13:55:53 +00:00
Automerger Merge Worker
1eedf27e67
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3
...
Change-Id: I006df7c1d8e4e2512e9934ec107c4e41f25f6d8b
2020-03-16 13:55:06 +00:00
Automerger Merge Worker
a692d719cb
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378
...
Change-Id: If953928e35be8b0a93b6438c32084238bd9b6859
2020-03-16 13:48:06 +00:00
Automerger Merge Worker
cdbca2b45e
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378
...
Change-Id: I3641366b12a396edc6dbafc50700f248bac002a8
2020-03-16 13:47:57 +00:00
