Jack He
|
85d9a7c48a
|
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
am: dfc2fb14c6
Change-Id: Ifb3276adeecf756b5c2aa11ee78f1c039273cfbe
|
2017-07-26 06:38:32 +00:00 |
|
Jack He
|
a65e3e6795
|
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09
Change-Id: I2a161d403cf0c8e34a16b1ac9328135c40f7e50a
|
2017-07-26 06:34:30 +00:00 |
|
Jack He
|
dfc2fb14c6
|
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09
Change-Id: I6f9494b049d3e366c96edb60686fc8622c8b76d6
|
2017-07-26 06:34:29 +00:00 |
|
Doris Ling
|
6c2e6e0946
|
Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a am: 3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
am: 40449ad439 -s ours
Change-Id: I4a56176a86d101069473a71ff8f2559782554f69
|
2017-07-26 06:31:27 +00:00 |
|
Doris Ling
|
aa40c67398
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a -s ours am: dac62d24f4 -s ours
am: 566eea85dc -s ours
Change-Id: Idb5b70997a0b9808fc57b0f8b2ab6a3d8b19d278
|
2017-07-26 06:31:03 +00:00 |
|
TreeHugger Robot
|
0c6f001c09
|
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
|
2017-07-26 06:28:44 +00:00 |
|
Android Build Merger (Role)
|
40449ad439
|
Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a am: 3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
|
2017-07-26 06:27:25 +00:00 |
|
Doris Ling
|
01c408bc76
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a
am: 3ab3fc9ee4 -s ours
Change-Id: I4cd260bd057d9e638f4848eb41aa9cd2ae8f3c35
|
2017-07-26 06:27:07 +00:00 |
|
Doris Ling
|
566eea85dc
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a -s ours
am: dac62d24f4 -s ours
Change-Id: I7c5148c30ff2aca518b63790c96566158cc42697
|
2017-07-26 06:27:06 +00:00 |
|
Fan Zhang
|
121d115bbb
|
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am: 5fb56c5b37 am: 2583cbe16b
am: 0c8c2ec24e
Change-Id: If29ca98d433b62da30bde6a6c874293958de6ba1
|
2017-07-26 06:23:43 +00:00 |
|
Doris Ling
|
3ab3fc9ee4
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am: 4906a2a38a
Change-Id: Ie5ad8d1e5a943f2d3f878ad6f30ac1f56c80085d
|
2017-07-26 06:23:08 +00:00 |
|
Doris Ling
|
dac62d24f4
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am: 4906a2a38a -s ours
Change-Id: I6f51c2464ab39e78c89625a0e27296c888080333
|
2017-07-26 06:23:03 +00:00 |
|
Fan Zhang
|
a01c4e7e6a
|
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am: 5fb56c5b37 am: 43ef9743a2
am: 6a8f288d3f
Change-Id: I1284133bbc3a601747674a259095cb1541460693
|
2017-07-26 06:23:01 +00:00 |
|
Fan Zhang
|
0c8c2ec24e
|
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am: 5fb56c5b37
am: 2583cbe16b
Change-Id: Icd3ceb208f807c9e8bd447ab2ba1cac99fc466e5
|
2017-07-26 06:14:39 +00:00 |
|
TreeHugger Robot
|
4906a2a38a
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
|
2017-07-26 06:11:07 +00:00 |
|
Fan Zhang
|
6a8f288d3f
|
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am: 5fb56c5b37
am: 43ef9743a2
Change-Id: Id6c3e260947c12d884ae76b2a8eadc4ed2dc3d73
|
2017-07-26 06:11:00 +00:00 |
|
Fan Zhang
|
43ef9743a2
|
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am: 5fb56c5b37
Change-Id: I7974307f83886ab9e075eee4ef347ef95562acef
|
2017-07-26 06:07:37 +00:00 |
|
Fan Zhang
|
2583cbe16b
|
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am: 5fb56c5b37
Change-Id: Id4ae064a804b649b431913f02bde26013c1c87c2
|
2017-07-26 06:07:30 +00:00 |
|
Fan Zhang
|
5fb56c5b37
|
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
|
2017-07-26 05:59:57 +00:00 |
|
Fan Zhang
|
0e641f55ae
|
Merge "Update misc strings" into oc-mr1-dev am: 34d30267e3
am: c2c42de513
Change-Id: I7581b873fdbee8174e65bf2f6064efa190b4e61e
|
2017-07-26 05:07:25 +00:00 |
|
Fan Zhang
|
c2c42de513
|
Merge "Update misc strings" into oc-mr1-dev
am: 34d30267e3
Change-Id: I2d6e173a84ca7c58c6be4785fcd787a052839199
|
2017-07-26 05:02:56 +00:00 |
|
TreeHugger Robot
|
34d30267e3
|
Merge "Update misc strings" into oc-mr1-dev
|
2017-07-26 04:59:29 +00:00 |
|
Doris Ling
|
a69e4e6272
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev am: 0224a409a9
am: 99d3b353c6 -s ours
Change-Id: I2902f06ec76ce4cbb2da5a125ec65838d4137d2b
|
2017-07-26 04:30:28 +00:00 |
|
Bill Yi
|
8a25fb603a
|
Import translations. DO NOT MERGE
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
|
2017-07-25 21:25:48 -07:00 |
|
Doris Ling
|
99d3b353c6
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
am: 0224a409a9
Change-Id: I5a4a38747df864ff7dbde6e0b9185c6196012908
|
2017-07-26 04:22:58 +00:00 |
|
Doris Ling
|
0224a409a9
|
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
|
2017-07-26 04:14:07 +00:00 |
|
Christine Franks
|
8e204dba0b
|
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316 am: be0ac89704
am: 58dfff8468
Change-Id: I982fcdc98259291049b3f8b46039ea9d89dfd23d
|
2017-07-26 03:21:55 +00:00 |
|
Christine Franks
|
5ffcae25c5
|
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316 am: a1f56b5faa
am: 02de4d0e23
Change-Id: I465d422b25e682cde7e486dc08b9871bff9383fe
|
2017-07-26 03:21:30 +00:00 |
|
Christine Franks
|
58dfff8468
|
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316
am: be0ac89704
Change-Id: I7589fb8ca10497b81736de29a4c6461723f06a93
|
2017-07-26 03:04:29 +00:00 |
|
Christine Franks
|
02de4d0e23
|
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316
am: a1f56b5faa
Change-Id: Idc0678e98f9606b991eb82c45f3c53dc65663905
|
2017-07-26 02:59:16 +00:00 |
|
Christine Franks
|
be0ac89704
|
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316
Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003
|
2017-07-26 02:56:36 +00:00 |
|
Christine Franks
|
a1f56b5faa
|
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316
Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
|
2017-07-26 02:52:52 +00:00 |
|
Christine Franks
|
a7e10e0316
|
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
|
2017-07-26 02:38:08 +00:00 |
|
Doris Ling
|
5dab5d3c75
|
Merge "Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: a60d3ef00c" into oc-mr1-dev-plus-aosp
am: 08703184cb
Change-Id: I5bc226ae2fadbba3f7026280e35a3a69f8c141ae
|
2017-07-26 02:16:41 +00:00 |
|
Doris Ling
|
882020d14b
|
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: f8bb8a9792
am: c0eac3803d
Change-Id: I72106b5c3e73dc194a5678e6e4c3ec6306d6b413
|
2017-07-26 02:16:15 +00:00 |
|
Android Build Merger (Role)
|
08703184cb
|
Merge "Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: a60d3ef00c" into oc-mr1-dev-plus-aosp
|
2017-07-26 02:12:40 +00:00 |
|
Doris Ling
|
c0eac3803d
|
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92
am: f8bb8a9792
Change-Id: I91b902ed5db6662e7e9fc2187049311b00b50cc6
|
2017-07-26 02:12:14 +00:00 |
|
Doris Ling
|
233e31700b
|
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92
am: a60d3ef00c
Change-Id: Ie34e317a4655731282cf3fdcf1d4ecdd8b040ff2
|
2017-07-26 02:12:14 +00:00 |
|
Doris Ling
|
a60d3ef00c
|
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92
Change-Id: I7fc59ace61bb89b40ab3eabe774a89128895515f
|
2017-07-26 02:08:45 +00:00 |
|
Doris Ling
|
f8bb8a9792
|
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92
Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
|
2017-07-26 02:08:44 +00:00 |
|
Matthew Fritze
|
fe48e4fe6b
|
Merge "Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec am: ee18f9f8aa" into oc-mr1-dev-plus-aosp
am: 43c1e45ce3
Change-Id: I2a3a8434ea655871306a9266c583dd0318b59421
|
2017-07-26 02:07:33 +00:00 |
|
Matthew Fritze
|
a438f67f1e
|
Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec am: 8e6181c4fe
am: 5d45bed429
Change-Id: If58d0301eab11d2fd37cba2374bd0b1ab6476b90
|
2017-07-26 02:07:07 +00:00 |
|
TreeHugger Robot
|
9c41094483
|
Merge "Disable Wallpaper setting when Wallpaper is disabled."
|
2017-07-26 02:04:20 +00:00 |
|
TreeHugger Robot
|
0e9711ab92
|
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
|
2017-07-26 02:02:32 +00:00 |
|
Android Build Merger (Role)
|
43c1e45ce3
|
Merge "Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec am: ee18f9f8aa" into oc-mr1-dev-plus-aosp
|
2017-07-26 02:02:23 +00:00 |
|
Matthew Fritze
|
01acdbed0f
|
Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec
am: ee18f9f8aa
Change-Id: I8e5f466787faac72a47496d14a2eb0821f9ed598
|
2017-07-26 02:01:43 +00:00 |
|
Matthew Fritze
|
5d45bed429
|
Merge "Add default value to inline payloads" into oc-dr1-dev am: 5aca5f3aec
am: 8e6181c4fe
Change-Id: Ia94fc41ae127a37a653a7d94ce1cf0d5ff04c693
|
2017-07-26 02:01:27 +00:00 |
|
Matthew Fritze
|
ee18f9f8aa
|
Merge "Add default value to inline payloads" into oc-dr1-dev
am: 5aca5f3aec
Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3
|
2017-07-26 01:57:29 +00:00 |
|
Matthew Fritze
|
8e6181c4fe
|
Merge "Add default value to inline payloads" into oc-dr1-dev
am: 5aca5f3aec
Change-Id: I5e15e7d80ac30f07390be702662939acbbc30675
|
2017-07-26 01:57:13 +00:00 |
|
TreeHugger Robot
|
5aca5f3aec
|
Merge "Add default value to inline payloads" into oc-dr1-dev
|
2017-07-26 01:52:38 +00:00 |
|