Atanas Kirilov
826b14e43e
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17e30d0145eadb9aa0fbfe9e0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17e30d0145eade0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17ee0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85fe0eeafcb5d5b4de5e724cb66517282874c51780fe0eeafcb5d5b4de5e724cb66517282e0eeafcb5d5b4de5e724e0eeafcb5d
2018-06-04 20:24:19 +00:00
Android Build Merger (Role)
1871d3d3a7
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9
...
Change-Id: Ib0b9bdb830263bbfb7c81033b388cd9e07e591ef
2018-05-24 18:22:37 +00:00
Android Build Merger (Role)
b9aa0fbfe9
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead
...
Change-Id: I164f89c547721b6b02fcd2bf57b224c92816e25b
2018-05-24 18:22:35 +00:00
Android Build Merger (Role)
30d0145ead
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e
...
Change-Id: I72e34eb278333a310cab6845c79f55df50478860
2018-05-24 18:22:34 +00:00
Android Build Merger (Role)
93ee1bd17e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f
...
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
2018-05-24 18:22:33 +00:00
Android Build Merger (Role)
551be9a85f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f
...
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
2018-05-24 18:22:32 +00:00
Android Build Merger (Role)
874c51780f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282
...
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
2018-05-24 18:22:30 +00:00
Android Build Merger (Role)
cb66517282
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724
...
Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72
2018-05-24 18:22:29 +00:00
Android Build Merger (Role)
5b4de5e724
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d
...
Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5
2018-05-24 18:22:19 +00:00
Antony Sargent
e0eeafcb5d
Merge translations of Bluetooth confirmation text
...
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name
Bug: 62672248
Test: manual
Change-Id: Iab08b43768f0aedd690570eb59dcb71c14c04784
2018-05-23 18:02:36 +00:00
Hansong Zhang
e36ca3e96d
DO NOT MERGE Give PBAP permission only after user confirms
...
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
2018-05-18 17:31:42 -07:00
TreeHugger Robot
d59b0eddae
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
...
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afae25ebddfdcee220e02387b2b84c617b1f00ebf9c4f58c19afae25ebddfdcee220e02387b2b84c6174f58c19afae25ebddfdcee220e02384f58c19afae25ebddfdc4f58c19afa
2018-04-09 20:29:54 +00:00
TreeHugger Robot
6a668c5630
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr2-dev
...
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afae25ebddfdcee220e02387b2b84c6174f58c19afae25ebddfdcee220e02384f58c19afae25ebddfdc4f58c19afa
2018-04-09 20:29:54 +00:00
TreeHugger Robot
70643c1bf4
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into cw-f-dev
...
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afae25ebddfdcee220e02384f58c19afae25ebddfdc4f58c19afa
2018-04-09 20:29:54 +00:00
TreeHugger Robot
8e2a3b1813
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr1-dev
...
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afae25ebddfdc4f58c19afa
2018-04-09 20:29:54 +00:00
TreeHugger Robot
6b6d337610
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-dr1-dev
...
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
2018-04-09 20:29:54 +00:00
TreeHugger Robot
eeafbd8d60
Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev
2018-04-09 20:29:54 +00:00
Android Build Merger (Role)
1990791bfe
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c
...
Change-Id: I4f02817d60b302e068caadd21ef4555f5f7d9221
2018-04-02 17:48:50 +00:00
Android Build Merger (Role)
b1f00ebf9c
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617
...
Change-Id: I23c3c75844ff136521f67f94d4d911a44571ae07
2018-04-02 17:48:48 +00:00
Android Build Merger (Role)
7b2b84c617
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
...
Change-Id: I3fdb63225079954bace095dc0ddfd78deb372ff8
2018-04-02 17:48:47 +00:00
Android Build Merger (Role)
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
...
Change-Id: I5b600093709bf93bb64ccacddeaa3cdf0b470107
2018-04-02 17:48:45 +00:00
Android Build Merger (Role)
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
...
Change-Id: Ibaab24729318954dbce44f3ccf53fcb4180ac1c7
2018-04-02 17:48:43 +00:00
Hansong Zhang
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
...
* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name
Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c
2018-04-02 10:48:18 -07:00
Android Build Merger (Role)
c4127072f4
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6
...
Change-Id: Idfc539317dd20a0216bb635fa0e014509d451069
2018-04-02 17:45:11 +00:00
Android Build Merger (Role)
74ff24d1c6
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e
...
Change-Id: I527b0743bd4b85ddaa7c2bff32523c1876cb8859
2018-04-02 17:45:10 +00:00
Android Build Merger (Role)
41be25548e
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1
...
Change-Id: I1a16852bc9676bf785836576bf034d0a1dc8cf4b
2018-04-02 17:45:08 +00:00
Android Build Merger (Role)
84061c71d1
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667
...
Change-Id: I72b65a7a76c93dff0dd5ffd9c3747c68c0a382e8
2018-04-02 17:45:07 +00:00
Android Build Merger (Role)
bab8dca667
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2
...
Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029
2018-04-02 17:45:05 +00:00
Android Build Merger (Role)
5d27bdb6d2
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666
...
Change-Id: Idf0afa49507f8ead25fd1b59809064f058281076
2018-04-02 17:45:03 +00:00
Android Build Merger (Role)
d276b38666
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7
...
Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf
2018-04-02 17:45:02 +00:00
Android Build Merger (Role)
dfe4cc74f7
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3
...
Change-Id: I7c2952f8540db9ee15ceac73bf1a0d73652f5163
2018-04-02 17:45:00 +00:00
Android Build Merger (Role)
5b98c9f4a3
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0
...
Change-Id: Id8ac4a63bd63d0a219364b520211ebae5ad6ea62
2018-04-02 17:44:58 +00:00
Hansong Zhang
ac6c49d2b0
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
...
* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name
Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: I85f5f11c5803c3031bf9a56273c30c3ef305f63d
2018-04-02 10:44:38 -07:00
Android Build Merger (Role)
5943908af4
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745
...
Change-Id: Ib8ff63887495bec58823610df2bfe993d024bb12
2018-02-13 00:43:56 +00:00
Android Build Merger (Role)
fb6a179745
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1
...
Change-Id: Ife59d44c290cc17fb50bf252e0d5018e694249f4
2018-02-13 00:43:53 +00:00
Android Build Merger (Role)
ca801490c1
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1
...
Change-Id: I2da83a86cf8dce95f26b21c02a426d53f5db5913
2018-02-13 00:43:50 +00:00
Android Build Merger (Role)
6827142bd1
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9
...
Change-Id: I43b0b5ebdb708b53d3df284c3f836bec85e6e028
2018-02-13 00:43:46 +00:00
Android Build Merger (Role)
ddd9cb6be9
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff
...
Change-Id: I789abf6753a183218b5a5b3497a4496d3e3b937c
2018-02-13 00:43:44 +00:00
Android Build Merger (Role)
5755ec9bff
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861
...
Change-Id: I999690b501e7fc8fb80b1d0d00b3ea325eef4247
2018-02-13 00:43:40 +00:00
Android Build Merger (Role)
eb76bf9861
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25
...
Change-Id: Ib7353cdd97c4da931c3ea3502e40fc72b61c1bb8
2018-02-13 00:43:37 +00:00
Android Build Merger (Role)
59ab695e25
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10
...
Change-Id: I04c83c01dd38c7498fdd7ca4b978bab482172801
2018-02-13 00:43:34 +00:00
Android Build Merger (Role)
d923718d10
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49
...
Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7
2018-02-13 00:43:27 +00:00
Antony Sargent
0a7ae11c49
Import translations. DO NOT MERGE
...
Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug: 62672248
Test: manual
Change-Id: I43db31f1495e6873b6905896e6fa75fd88b4cb8d
2018-02-13 00:43:21 +00:00
Antony Sargent
26e5f828f7
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
...
am: db6e747ab9
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
...
am: acacd658f1
2017-12-05 17:32:41 +00:00
Antony Sargent
acacd658f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
...
am: 9867a3ef85
2017-12-05 17:28:54 +00:00
Antony Sargent
9867a3ef85
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
...
am: 3d7dbd6407
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
...
am: 24f063a207
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
...
am: 9cf1fc73f1
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
...
am: eee62e1846
2017-12-05 17:19:12 +00:00
