OSDN Git Service
Doris Ling [Thu, 9 Aug 2018 19:06:31 +0000 (12:06 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev am:
197a10b053
am:
9245b98d0f
Change-Id: Ia674ef3fc7eb8042c58ca3da03ecb8b08df91eed
Doris Ling [Thu, 9 Aug 2018 19:05:08 +0000 (12:05 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev am:
528be61eeb
am:
78a7ee2f10
Change-Id: I82960fb637152698cb676fae82862408b1a2db75
Doris Ling [Thu, 9 Aug 2018 19:03:48 +0000 (12:03 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b am:
3672a1fe7f
am:
cff5200146
Change-Id: I44df485b49098b69371d1248067e51559dcd4964
Doris Ling [Thu, 9 Aug 2018 19:02:34 +0000 (12:02 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev
am:
197a10b053
Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96
Doris Ling [Thu, 9 Aug 2018 19:00:42 +0000 (12:00 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev
am:
528be61eeb
Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3
Doris Ling [Thu, 9 Aug 2018 18:58:38 +0000 (11:58 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b
am:
3672a1fe7f
Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7 skipped:
3503445e59
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.
TreeHugger Robot [Thu, 9 Aug 2018 18:34:12 +0000 (18:34 +0000)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6 skipped:
1b622b07be
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5
DO NOT MERGE Disable changing lock when device is not provisioned.
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:11 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6 skipped:
1b622b07be
Change-Id: I2755a79cc942e8dc063f3a420e0ed02817959cec
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:09 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:08 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4
Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:06 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011
Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:04 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5
Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:04 +0000 (01:03 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7 skipped:
3503445e59
Change-Id: I83aa2c1573b6310112b3575b4b4b35ef3c7f57d9
Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:02 +0000 (01:03 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7
Change-Id: I67d4821190d4a6283a54a23a087984b9ca18063f
Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:00 +0000 (01:03 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f
Change-Id: If3f680b663909bd4e40b3e9033fed9cd0c8f537a
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Android Build Merger (Role) [Fri, 3 Aug 2018 01:00:48 +0000 (01:00 +0000)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b
Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Fan Zhang [Thu, 28 Jun 2018 04:56:41 +0000 (21:56 -0700)]
Delete obsolete activity alias for dev settings am:
0e1393ae8c
am:
afbdbeb7d5
Change-Id: I0bbd3a65b7f1ab11e0f182ca4421c8c5911e6ad2
Fan Zhang [Thu, 28 Jun 2018 04:53:33 +0000 (21:53 -0700)]
Delete obsolete activity alias for dev settings
am:
0e1393ae8c
Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4
Fan Zhang [Thu, 7 Jun 2018 16:45:23 +0000 (16:45 +0000)]
Delete obsolete activity alias for dev settings
This activity alias is here since android 4.x for backward
compatibility. We no longer need it, and keeping it will cause security
issue.
Change-Id: Ib7817fd7cf8c8e66ca50534a0387cdc5773f837b
Merged-In: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes:
92497653
Test: manual
Atanas Kirilov [Tue, 5 Jun 2018 00:10:35 +0000 (17:10 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am:
8994d1f0a4 -s ours
am:
b072779789 -s ours
Change-Id: I517819e05e5283e6c50555c713d79b34179a4f7c
Atanas Kirilov [Mon, 4 Jun 2018 23:59:14 +0000 (16:59 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
am:
8994d1f0a4 -s ours
Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81
Atanas Kirilov [Mon, 4 Jun 2018 23:14:11 +0000 (16:14 -0700)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev am:
9b4f5525b4
am:
dededea9f3
Change-Id: Ia42df7f876f964d153b217de4f501a0b7f03d363
Atanas Kirilov [Mon, 4 Jun 2018 23:13:02 +0000 (16:13 -0700)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev am:
75f0072c94
am:
67892acff1
Change-Id: I4ca44d469bf063ba68b078ba830a5b7f4d86a2cb
Atanas Kirilov [Mon, 4 Jun 2018 23:10:32 +0000 (16:10 -0700)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev am:
438cf9da52
am:
a29108a778
Change-Id: I24bdca64cf308155ae9499fc0db629ba31c85e90
Atanas Kirilov [Mon, 4 Jun 2018 23:09:33 +0000 (16:09 -0700)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev am:
9e626734bb
am:
65db9c47b9
Change-Id: I86cff1a6b90fbf53738d76f26fee07637db7da95
Atanas Kirilov [Mon, 4 Jun 2018 23:07:36 +0000 (16:07 -0700)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev am:
826b14e43e
am:
74d98110f3
Change-Id: Ie334ee442e46dffa11926b471b0a096a3c4f1f92
Atanas Kirilov [Mon, 4 Jun 2018 22:43:14 +0000 (15:43 -0700)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev
am:
9b4f5525b4
Change-Id: I325923e835cf57736106da3ce8cc26aefa4ee3f7
Atanas Kirilov [Mon, 4 Jun 2018 22:41:42 +0000 (15:41 -0700)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev
am:
75f0072c94
Change-Id: Ife69a5cf4637ef6b605415c5fa9f818f2644d54c
Atanas Kirilov [Mon, 4 Jun 2018 22:39:29 +0000 (15:39 -0700)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev
am:
438cf9da52
Change-Id: I0964b2320f0b6d55923847bbba779bb8ee5c2794
Atanas Kirilov [Mon, 4 Jun 2018 22:38:17 +0000 (15:38 -0700)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev
am:
9e626734bb
Change-Id: I6536e0423a261da7232b6229d96019fea35f5bfe
Atanas Kirilov [Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev
am:
826b14e43e
Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8
Atanas Kirilov [Mon, 4 Jun 2018 20:37:42 +0000 (20:37 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into nyc-mr2-dev
* changes:
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into cw-f-dev
* changes:
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into nyc-mr1-dev
* changes:
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into nyc-dr1-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev
* changes:
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e am:
e20b700ac1
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into nyc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293 skipped:
e9345782e2 skipped:
c874b450af
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293 skipped:
e9345782e2
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into nyc-mr2-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293 skipped:
e9345782e2
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into cw-f-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into nyc-mr1-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into nyc-dr1-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:35 +0000 (20:24 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into nyc-mr2-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:24:34 +0000 (20:24 +0000)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
732b65ca4d
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b skipped:
3e48235bf6
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into nyc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into cw-f-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into nyc-mr1-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into nyc-dr1-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into nyc-mr2-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:19 +0000 (20:24 +0000)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f skipped:
93ee1bd17e skipped:
30d0145ead skipped:
b9aa0fbfe9
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f skipped:
93ee1bd17e skipped:
30d0145ead
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f skipped:
93ee1bd17e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
Merge translations of Bluetooth confirmation text
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
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: I829baada46cdb2314021d8772feb8811072e41d8
Merged-In: I2d8c57680d1d98b74193654e9fe77016304f6ac5
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:18 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e am:
e20b700ac1
Change-Id: Ib56a32b88c58c7b1a54ba4522cd9bf4bd80cd6e5
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:16 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e
Change-Id: Ib1f576348a4e89028ddb3d731ecdc1c92599723d
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:08 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa
Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f
Hansong Zhang [Wed, 30 May 2018 20:32:52 +0000 (13:32 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms am:
e36ca3e96d
am:
48aa959b14
Change-Id: I13480b0bf786ddd05959cb597492041e273d920c
Hansong Zhang [Wed, 30 May 2018 20:23:53 +0000 (13:23 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms
am:
e36ca3e96d
Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d
Android Build Merger (Role) [Thu, 24 May 2018 18:22:37 +0000 (18:22 +0000)]
[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
Android Build Merger (Role) [Thu, 24 May 2018 18:22:35 +0000 (18:22 +0000)]
[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
Android Build Merger (Role) [Thu, 24 May 2018 18:22:34 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f skipped:
93ee1bd17e
Change-Id: I72e34eb278333a310cab6845c79f55df50478860
Android Build Merger (Role) [Thu, 24 May 2018 18:22:33 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
Android Build Merger (Role) [Thu, 24 May 2018 18:22:32 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
Android Build Merger (Role) [Thu, 24 May 2018 18:22:30 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
Android Build Merger (Role) [Thu, 24 May 2018 18:22:29 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724
Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72
Android Build Merger (Role) [Thu, 24 May 2018 18:22:19 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
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
Android Build Merger (Role) [Mon, 21 May 2018 22:49:17 +0000 (22:49 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
732b65ca4d
Change-Id: I89bf7eb803969f28afc67c2c2073b6169131c3fe
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
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: I829baada46cdb2314021d8772feb8811072e41d8
Android Build Merger (Role) [Mon, 21 May 2018 22:05:41 +0000 (22:05 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a
Change-Id: I8bb2f283f86210447788c3191b67c1936e7b0a72
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
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: I049138002f07e78442ddebfa746d6128b5689947
Android Build Merger (Role) [Mon, 21 May 2018 21:00:05 +0000 (21:00 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293 skipped:
e9345782e2 skipped:
c874b450af
Change-Id: I9d42278f5f9dae38dacf16012b242c6dd9b5abb2
Android Build Merger (Role) [Mon, 21 May 2018 21:00:04 +0000 (21:00 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293 skipped:
e9345782e2
Change-Id: Iacafdefee68a900d636db83ccbf764114327a805
Android Build Merger (Role) [Mon, 21 May 2018 21:00:03 +0000 (21:00 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293
Change-Id: Ia02c7c5d5e52abcd2ecfbf0d9399efad31c3575e
Android Build Merger (Role) [Mon, 21 May 2018 21:00:01 +0000 (21:00 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf
Change-Id: I1fa52208a183a67c694c9457bb304f94c1a05ec1
Android Build Merger (Role) [Mon, 21 May 2018 20:59:52 +0000 (20:59 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5
Change-Id: Ic63f7f831df3111a5ce1cda7759e760563ea574d
Hansong Zhang [Thu, 17 May 2018 20:54:00 +0000 (13:54 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms
Bug:
72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
Android Build Merger (Role) [Wed, 2 May 2018 22:37:16 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b skipped:
3e48235bf6
Change-Id: Iea466a1bb688d8ff74cbb6cf964fbd7205705960
Android Build Merger (Role) [Wed, 2 May 2018 22:37:15 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b
Change-Id: I5beeaa99ef0cafa7ac716dc0745c90855954dc60
Android Build Merger (Role) [Wed, 2 May 2018 22:37:13 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8
Change-Id: Ie0c9a58d5b24ae22fa183f656c2378fa957da7c1
Android Build Merger (Role) [Wed, 2 May 2018 22:37:12 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e
Change-Id: Ie28e68f8334f8e6e74241c25b522bb64a16e3f1b
Android Build Merger (Role) [Wed, 2 May 2018 22:37:10 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
Change-Id: Ibb7ba4f78bb2ff73ddde61bf4fb57ef2997517b0
Android Build Merger (Role) [Wed, 2 May 2018 22:37:02 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Change-Id: I552259236b2aef72e2b50441943e6b413fdd3ab7
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
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: Id393c4296efef03f38b6e55396c83da9dd9c8b4c
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
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: Ia386cc2d98de086ed545e4fe6d41be20e9c24dc4
Hansong Zhang [Mon, 9 Apr 2018 20:54:58 +0000 (13:54 -0700)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into oc-dev am:
d59b0eddae
am:
3f2dbb7cc9
Change-Id: Ica684d7a7fc36439111b7eeb3886761f63a7130f
Hansong Zhang [Mon, 9 Apr 2018 20:53:41 +0000 (13:53 -0700)]
[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 am:
c4127072f4
am:
1b7566cd07
Change-Id: I10c2d233f05ddf566ac38afb7c2cdc5a8e61df25
Hansong Zhang [Mon, 9 Apr 2018 20:44:07 +0000 (13:44 -0700)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into oc-dev
am:
d59b0eddae
Change-Id: Ia628cc0bd02429ec321d8e80c9d9ad2c097715bd
Hansong Zhang [Mon, 9 Apr 2018 20:43:04 +0000 (13:43 -0700)]
[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
am:
c4127072f4
Change-Id: I559bfa947ae6f7ee89076d05826fd4529d6b0cc2
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
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:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
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:
4f58c19afa am:
e25ebddfdc am:
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
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:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617 skipped:
b1f00ebf9c
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
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:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
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
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:50 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617 skipped:
b1f00ebf9c
Change-Id: I4f02817d60b302e068caadd21ef4555f5f7d9221