Paul Hu
d98423fd22
Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev am: 37318d03a4 am: 9821b664b7 am: a4f7f62dd1
...
Change-Id: I59a38cb03871cdcbf1498f385a9ccca778ba0d9a
2020-05-26 06:32:10 +00:00
Paul Hu
a4f7f62dd1
Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev am: 37318d03a4 am: 9821b664b7
...
Change-Id: I7fd79aa6294b0c0b6748169b68599e0b2757a614
2020-05-26 06:16:41 +00:00
Paul Hu
9821b664b7
Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev am: 37318d03a4
...
Change-Id: I18618155c37e90cb08337f78a8000ccbc227419b
2020-05-26 06:00:52 +00:00
Paul Hu
37318d03a4
Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev
2020-05-26 05:47:09 +00:00
Treehugger Robot
2980ed5e8b
Merge "Settings performance testing" am: 32ca9b270d am: 9cfbb7fba3 am: 271f5f2972 am: 01f5f6ad49
...
Change-Id: I559dc37023b784e58bb477823e2b93dbc46eb70d
2020-05-25 14:22:10 +00:00
Treehugger Robot
01f5f6ad49
Merge "Settings performance testing" am: 32ca9b270d am: 9cfbb7fba3 am: 271f5f2972
...
Change-Id: Ia6596cef93e0c433979a23bf12ce674f216ed337
2020-05-25 14:08:22 +00:00
Treehugger Robot
271f5f2972
Merge "Settings performance testing" am: 32ca9b270d am: 9cfbb7fba3
...
Change-Id: If7a33f361203d5d27407ba8b8419f84fa5b931ed
2020-05-25 13:56:14 +00:00
Treehugger Robot
9cfbb7fba3
Merge "Settings performance testing" am: 32ca9b270d
...
Change-Id: Id0f496b2c8709c2655eadccef900256d52a6a130
2020-05-25 13:44:32 +00:00
Treehugger Robot
32ca9b270d
Merge "Settings performance testing"
2020-05-25 13:32:11 +00:00
youtengliang
bc1618f5d5
Settings performance testing
...
1. Enable airplane mode before start testing.
2. Reset airplane mode after testing.
3. Add all_results tag to track results we have.
4. Add result_count tag to track how many results we have.
5. Add shell command result details to log.
Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: I24ed167599b660b2aa94b4a3f8ddae1dcf3d04ff
2020-05-25 16:37:03 +08:00
Bill Yi
8699acd76c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 4bd86eba02 -s ours am: 267b63e1a2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6c595e34c4ae11393caaee096c1a24f7a422da52
2020-05-23 14:31:26 +00:00
Bill Yi
0897dd9fdd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 8643486fa9 -s ours am: 6d0f303f44 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I642c8df5ee3b6dae36416511a8dde4ce8036fcf7
2020-05-23 14:30:55 +00:00
Bill Yi
8772760703
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 4bd86eba02 -s ours am: 46aa733b9f -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibc73504de147dcd1ad8eee562c8ae2f35879ef77
2020-05-23 14:30:30 +00:00
Bill Yi
6d0f303f44
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 8643486fa9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ieba6e6a2ac62a0a7680a6192ae88da7b2feb53f3
2020-05-23 14:15:39 +00:00
Bill Yi
267b63e1a2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 4bd86eba02 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5e1cce3d8737459850ebf31113e2fdeba0e68a93
2020-05-23 14:15:35 +00:00
Bill Yi
46aa733b9f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 4bd86eba02 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If8bb5a3b7fb51c2f978c151413939e994b6bb488
2020-05-23 14:15:25 +00:00
Bill Yi
4bd86eba02
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6970239f79d3ae7b2ce56138fc764c317ec5130d
2020-05-23 13:55:26 +00:00
Bill Yi
8643486fa9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I288b377fa62ad7147586ac99fadefe882e38018f
2020-05-23 13:55:26 +00:00
Bill Yi
1e0789355e
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-23 13:32:43 +00:00
Bill Yi
690442c1cb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 12072f339e -s ours am: 41f149889e -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iecb7ad21b59404affc22ab5ccf3c7a1064220af0
2020-05-22 16:12:25 +00:00
Bill Yi
5e2e603eef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours am: 110067aa96 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib8fa535463005d4a35eecf52d4fc1497cb8e4f8f
2020-05-22 16:12:17 +00:00
Bill Yi
42e614ea94
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours am: 115a3e2a47 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2bf5cd1565069c44024d6c10b4be1b7616c65e22
2020-05-22 16:11:59 +00:00
Bill Yi
110067aa96
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic2b7a93e22922a9b6c5c878bd1cd60cba3a0f838
2020-05-22 16:00:19 +00:00
Bill Yi
41f149889e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 12072f339e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5933c17de23b934e37075c76937767dc33aa1180
2020-05-22 16:00:00 +00:00
Bill Yi
115a3e2a47
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5f1ec20ea861b8cb6f930ba89207409170bdb777
2020-05-22 15:59:54 +00:00
Bill Yi
131a9cb96e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3ad0501601df178a732a73b318ba9104374d27ea
2020-05-22 15:47:26 +00:00
Bill Yi
12072f339e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I9cb17d06ec70b135859f8e2c5f61f56e86839972
2020-05-22 15:47:26 +00:00
Bill Yi
8019c16a14
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-22 15:20:44 +00:00
Julia Reynolds
cc52f7858a
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e8cf759ece
...
Change-Id: I930dc1647ced5e84ee4c2cf3989e59eb49d6df10
2020-05-22 12:19:35 +00:00
Automerger Merge Worker
b9ea92cb77
Merge "Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: cb57feba56" into rvc-qpr-dev-plus-aosp
2020-05-22 12:19:29 +00:00
Julia Reynolds
0035fac0d4
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4fbaf23958 am: c50639ab32
...
Change-Id: Ie56d103052293c4de79486610e074bc339424c72
2020-05-22 12:19:20 +00:00
Julia Reynolds
110c2f7bb8
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: cb57feba56
...
Change-Id: I643ef2b93a7219d18b1a1721adbddd4b869c60b4
2020-05-22 12:19:18 +00:00
Julia Reynolds
30412ccf99
Update conversation-related strings am: 9e78ec75d1 am: f7eade72c6 am: c5570305d8
...
Change-Id: I4bed80e64f5b61e3fa7800d5426a20295ff30a6f
2020-05-22 12:19:13 +00:00
Julia Reynolds
8b1d3fc28e
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e5fc3bb57c
...
Change-Id: If5c22b0fdcbcf9799fc7887e19a9880a2540c4b7
2020-05-22 12:19:06 +00:00
Julia Reynolds
0051068fcb
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb
...
Change-Id: I01fa401ce81d6c6f50b4fa4cbf04d621401f899b
2020-05-22 12:19:00 +00:00
Julia Reynolds
e8cf759ece
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8
...
Change-Id: I7e590f2902bae5c385121d2d41121437c846be13
2020-05-22 12:04:19 +00:00
Julia Reynolds
c50639ab32
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4fbaf23958
...
Change-Id: I854f495cf222ca7a3d10d99e654a519427de8b88
2020-05-22 12:04:17 +00:00
Julia Reynolds
cb57feba56
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d
...
Change-Id: Ib934269cce4f953461160f53cb020cb6fedf6862
2020-05-22 12:04:11 +00:00
Julia Reynolds
c5570305d8
Update conversation-related strings am: 9e78ec75d1 am: f7eade72c6
...
Change-Id: I071211b233ce480fea38f069470bfe9441603cd0
2020-05-22 12:04:11 +00:00
Julia Reynolds
e5fc3bb57c
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8
...
Change-Id: I7c8da87f67f1306425677b6de82498cab2f3b45f
2020-05-22 12:04:02 +00:00
Julia Reynolds
423fdfa8bb
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d
...
Change-Id: I124b22d123aa7abf5bbc3adc264478e166cd900d
2020-05-22 12:03:49 +00:00
Julia Reynolds
4fbaf23958
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
...
Change-Id: I3c7138e8e806aeed78da7a1c0807790af8b519f0
2020-05-22 11:48:42 +00:00
Julia Reynolds
f7eade72c6
Update conversation-related strings am: 9e78ec75d1
...
Change-Id: I11b6a55cffee069a1aef0df8d2ca9be0ca141161
2020-05-22 11:48:36 +00:00
Julia Reynolds
4b78d753b8
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
...
Change-Id: I2a163df1ff0574518804bcff3be2f9650357f73a
2020-05-22 11:48:34 +00:00
Julia Reynolds
61e956443d
Update conversation-related strings am: 9e78ec75d1
...
Change-Id: I9fb42f08125dcfd078045c5737bae429870022d5
2020-05-22 11:48:26 +00:00
Julia Reynolds
edca211a67
Merge "clean up layout & styling of notification history" into rvc-dev
2020-05-22 11:23:59 +00:00
Julia Reynolds
9e78ec75d1
Update conversation-related strings
...
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
2020-05-21 20:49:53 +00:00
Bill Yi
0cc77c1db8
Import translations. DO NOT MERGE
...
BUG:154363304
Auto-generated-cl: translation import
Change-Id: I5e504e86b52fa341e03a497003190ca2e250bb01
2020-05-21 20:26:49 +00:00
Automerger Merge Worker
beecea6aec
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020
...
Change-Id: I3233d44bb75457662fca639cbf24cc4d04c15c55
2020-05-21 19:55:49 +00:00
Automerger Merge Worker
e33d4e6512
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae" into rvc-qpr-dev-plus-aosp
2020-05-21 19:55:19 +00:00
