Automerger Merge Worker
ff2d8b1b89
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d" into rvc-d1-dev-plus-aosp am: ebb199a374
...
Change-Id: Ie1b38d4373ab4108b9d2f59e439013168873f032
2020-05-29 05:54:20 +00:00
Automerger Merge Worker
e173285ddd
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d am: 69f1c522a2" into rvc-qpr-dev-plus-aosp
2020-05-29 05:54:10 +00:00
tim peng
cc6ce21c84
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 771ece6156 am: 8b5d909a86
...
Change-Id: Idbcae1b4022166acaf668296cfd43bb3147861e2
2020-05-29 05:53:56 +00:00
tim peng
1c4bde0dc5
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d am: 69f1c522a2
...
Change-Id: I00ca619a9578bfc3c561540d5cb833a183acecc2
2020-05-29 05:53:56 +00:00
Automerger Merge Worker
ebb199a374
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d" into rvc-d1-dev-plus-aosp
2020-05-29 05:36:14 +00:00
tim peng
69f1c522a2
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d
...
Change-Id: I9d4758a3b66cf95ade0f9eef250d36e2b44c18de
2020-05-29 05:36:09 +00:00
tim peng
8b5d909a86
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 771ece6156
...
Change-Id: Iadb742a7328cc8b8a135c55026e19727c09e9415
2020-05-29 05:36:07 +00:00
tim peng
0292ef59a3
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d
...
Change-Id: I63d82781f0b548d8724495449b608fb638410b57
2020-05-29 05:36:02 +00:00
tim peng
1b1e05fb1d
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
...
Change-Id: I8bb341fb70c18e314ae8ac2bdfbf5ce1140845b5
2020-05-29 05:22:02 +00:00
tim peng
771ece6156
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
...
Change-Id: I462bcb49de448b2a1d5ac81dd75460ca08c6558c
2020-05-29 05:21:48 +00:00
tim peng
6febf2c629
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev
2020-05-29 05:09:07 +00:00
Tim Peng
0989586ce2
[ANR] Settings froze
...
-To handle getActiveLocalMediaController() in a background thread
-To update test cases for waiting LocalMediaManager initial in
background thread
Bug: 157522889
Test: make -j42 RunSettingsRoboTests
Change-Id: I27cd282a89ac9cfb6a098843f7282d5b94d98402
2020-05-29 02:30:56 +00:00
Jay Aliomer
fdd0799324
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 867766f919 am: e05aaa40dd am: 57a8f7740e
...
Change-Id: I41debd3642386c272188c74677c554b391965868
2020-05-29 00:21:39 +00:00
TreeHugger Robot
7619d1fb61
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 22c94f426a -s ours am: 53395c5430 -s ours am: cc545d0b9c -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6c9c43ec5bddb0e6c11fb607d2c169d5f56f609d
2020-05-29 00:21:33 +00:00
Jay Aliomer
961bd9a7d8
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: 2f9e6f6ba3 am: bc1d235392 am: 785a3d591a am: 8531253d84
...
Change-Id: I4022c246c14dfee0b76750b4a0f1bdd33dc16346
2020-05-29 00:21:26 +00:00
Jay Aliomer
60997ff85b
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 73a818e99f am: cfebbe6fa6 am: b74593007f
...
Change-Id: I26faab61261bf66278fb3dba18fc99c48660f58c
2020-05-29 00:21:07 +00:00
TreeHugger Robot
327c074319
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 83be1b647b -s ours am: 2b4eb7d8ca -s ours am: 835efa7390 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie80ddcbf1ab35090e42b21a8df0469adedf7d7e5
2020-05-29 00:19:27 +00:00
Jay Aliomer
57a8f7740e
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 867766f919 am: e05aaa40dd
...
Change-Id: I1fb8898844b1c19589f9192745c650bac84f3128
2020-05-29 00:05:51 +00:00
TreeHugger Robot
cc545d0b9c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 22c94f426a -s ours am: 53395c5430 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I222e4f1043fa9b92cc84336725f3b4806b7ac2ca
2020-05-29 00:05:44 +00:00
Jay Aliomer
8531253d84
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: 2f9e6f6ba3 am: bc1d235392 am: 785a3d591a
...
Change-Id: I6adcb5a9fd642d7e1eb09283baa5e434a75c4127
2020-05-29 00:05:37 +00:00
Jay Aliomer
b74593007f
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 73a818e99f am: cfebbe6fa6
...
Change-Id: Ie6cce67aac703db052a40d8ec7be98b9ca109905
2020-05-29 00:05:01 +00:00
TreeHugger Robot
835efa7390
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 83be1b647b -s ours am: 2b4eb7d8ca -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4e5c212014a42fb4ee8a93108b240ed4c3dbc159
2020-05-29 00:04:34 +00:00
Jay Aliomer
e05aaa40dd
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 867766f919
...
Change-Id: If8cc90c895e0823f8d74face3af40f998ed45acd
2020-05-28 23:54:02 +00:00
TreeHugger Robot
53395c5430
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 22c94f426a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I475826fdbf9649c4689d8ad183af1e1910a11150
2020-05-28 23:53:46 +00:00
Jay Aliomer
785a3d591a
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: 2f9e6f6ba3 am: bc1d235392
...
Change-Id: I160dd5a1e1b3b508f68dcf1e1e20a7fb08ac5e23
2020-05-28 23:51:09 +00:00
Jay Aliomer
cfebbe6fa6
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 73a818e99f
...
Change-Id: I74c5492c4d9a0a66b80f4b5b0780938f8407055f
2020-05-28 23:51:02 +00:00
Jay Aliomer
bc1d235392
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: 2f9e6f6ba3
...
Change-Id: I65a6524f259ae3cdbdaa9d11f8f86bcf5b065b68
2020-05-28 23:50:58 +00:00
TreeHugger Robot
2b4eb7d8ca
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 83be1b647b -s ours
...
am skip reason: subject contains skip directive
Change-Id: If6204490b442e7cdffde5f3f0f735224a94a56b4
2020-05-28 23:50:50 +00:00
TreeHugger Robot
135836fb09
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: d66734ab2a -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib268b68be8c53e54c9a2788b94ff9c5ca65e8b91
2020-05-28 23:40:53 +00:00
Jay Aliomer
867766f919
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d
...
Change-Id: Ib8c21c6139fcb69d8abf985303f93e8434beaa07
2020-05-28 23:38:53 +00:00
TreeHugger Robot
22c94f426a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I36f184163f2f990ac913cef2e41b48d362e6834c
2020-05-28 23:38:37 +00:00
Jay Aliomer
73a818e99f
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d
...
Change-Id: I2f3937ea0edfa14470bbf9dd4d7d147bf39cd8d6
2020-05-28 23:38:34 +00:00
TreeHugger Robot
83be1b647b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie33f766bfdd35e198bafed6eeaee788c21f861aa
2020-05-28 23:38:18 +00:00
Jay Aliomer
e931c35f4d
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
...
Change-Id: Ibf41defa2849b26c934dd3b72d30117993d696f2
2020-05-28 23:37:48 +00:00
Jay Aliomer
2f9e6f6ba3
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
...
Change-Id: I1b5f3194e8a9df86aacc359322792c0e0561f9b2
2020-05-28 23:37:07 +00:00
TreeHugger Robot
3304eb3fb6
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-28 22:52:24 +00:00
TreeHugger Robot
d66734ab2a
Merge "Import translations. DO NOT MERGE"
2020-05-28 22:23:46 +00:00
Jay Aliomer
fb6711ae92
Merge "Incorrect localization of dark theme custom time" into rvc-dev
2020-05-28 22:21:21 +00:00
TreeHugger Robot
c12763aef0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: 4bd0678f8d -s ours am: e5358d39d7 -s ours am: 96accc9267 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I00bb9d05a0724c54e4b217a97a159ad32b097b37
2020-05-28 21:15:04 +00:00
TreeHugger Robot
108026f1fa
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: ccb6c24c76 -s ours am: 13d2ad4f12 -s ours am: 5f69ad3c6d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id408b82df8c5401bad1826e8fc51b7d5407f3f11
2020-05-28 21:14:47 +00:00
TreeHugger Robot
a5017338a8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: d33f82d74d -s ours am: 7b20181315 -s ours am: c18e67ab2a -s ours am: ab85240fa7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I04bacfff29d23f7a05737ed4bd1292e407b4e513
2020-05-28 21:14:29 +00:00
TreeHugger Robot
96accc9267
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: 4bd0678f8d -s ours am: e5358d39d7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I40cb41bdcdd6ee0b47e056ca83c3090fc60103ab
2020-05-28 21:00:13 +00:00
TreeHugger Robot
5f69ad3c6d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: ccb6c24c76 -s ours am: 13d2ad4f12 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iaea3f1be479ece9d56154f0e6d9adf8b4dbfcebd
2020-05-28 20:59:51 +00:00
TreeHugger Robot
ab85240fa7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: d33f82d74d -s ours am: 7b20181315 -s ours am: c18e67ab2a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7d9dbcc201abf5494ee9c3225c1ba7ca4f3277c3
2020-05-28 20:59:23 +00:00
TreeHugger Robot
e5358d39d7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: 4bd0678f8d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifff040da521b8b0a5a0eb86b2fd427783514f5ae
2020-05-28 20:42:40 +00:00
TreeHugger Robot
13d2ad4f12
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: ccb6c24c76 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If88543b1f31a0762c83d320a9c835fde144c3383
2020-05-28 20:42:28 +00:00
TreeHugger Robot
c18e67ab2a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: d33f82d74d -s ours am: 7b20181315 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2381414dd4ce40b2cbdd61494ed858e7154ff8a5
2020-05-28 20:42:18 +00:00
Bill Yi
d82e09779f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ib3365a6f40fab0c12bb467b8aa05ad1e1085192a
2020-05-28 20:36:29 +00:00
TreeHugger Robot
ccb6c24c76
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I610e1391362a307dfba04724aba4c87ad4688f76
2020-05-28 20:25:40 +00:00
TreeHugger Robot
4bd0678f8d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0e9923c6059bb8d6a6b7b2f04c357d2ca74dcbe8
2020-05-28 20:25:29 +00:00
