mingliang.x.lei
|
05d56ce9c8
|
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad am: c46b5e60b9 am: 8ba28798aa
am: cc6b8a868d
Change-Id: Ie742ea8ba0f1e463ddafe7d76e174df6e33fb860
|
2017-08-10 02:28:19 +00:00 |
|
The Android Open Source Project
|
f6d579674b
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours am: 5d13310d94 -s ours
am: df5bd79a29 -s ours
Change-Id: I8fc08eed8251897ed505f021b39f2c4a08d01233
|
2017-08-10 02:27:57 +00:00 |
|
Daniel Nishi
|
03b045560d
|
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 5f3f655ad2
am: a17d748f9b
Change-Id: I2b230a5f8b23303fb5bd88dfa7847751adfe801e
|
2017-08-10 02:27:12 +00:00 |
|
Ruchi Kandoi
|
7b5bc6b2b1
|
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: 3b012860db
am: 71a351af08
Change-Id: If29f26ebf90a856663849327e0a2d167e2cc16a0
|
2017-08-10 02:26:48 +00:00 |
|
Salvador Martinez
|
cb9614d18c
|
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 3781030b94
am: 5cefe64942
Change-Id: I4cc6e34dfa07eab71f17f74cf92102fee9d7bb2f
|
2017-08-10 02:25:43 +00:00 |
|
qqzhou
|
bef7e0de9d
|
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de am: 467aad4219
am: add20708ba
Change-Id: Ic4dadceeb8d6a5197875177343f103e87df08a30
|
2017-08-10 02:25:22 +00:00 |
|
Daniel Nishi
|
11c93deda6
|
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours am: 14be0e4124 -s ours
am: 319c45ad51 -s ours
Change-Id: I187c1f7713d5565cfa1fad451f9f0c6dd8225363
|
2017-08-10 02:24:19 +00:00 |
|
Matthew Fritze
|
6de9f65ced
|
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours am: 730bad152c -s ours
am: 580810a738 -s ours
Change-Id: Id8e3eb9d1a0058d8a8e3a193cc97abdff3da0d1a
|
2017-08-10 02:22:54 +00:00 |
|
The Android Open Source Project
|
1ad08db58c
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours am: aeee659147 -s ours
am: 71460b0859 -s ours
Change-Id: Ib6d0aecabd64c444403868a2a69377c000f5b0d1
|
2017-08-10 02:22:31 +00:00 |
|
Daniel Nishi
|
591c654fb7
|
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 8bbc28a95b
am: 6df5c65f45
Change-Id: I4cc89e8bebedc294c6c30ca6456f86f48a9a46b4
|
2017-08-10 02:22:09 +00:00 |
|
Ruchi Kandoi
|
01e0523441
|
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: bf81a17a31
am: 706c6ba20e
Change-Id: Ie112f53cb222845c75a71def7b4aaf5dc3c8753e
|
2017-08-10 02:21:48 +00:00 |
|
Salvador Martinez
|
f3692132ca
|
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 7bc388d823
am: 35c0949b2e
Change-Id: I3f7f56e233c8fe4b06269ef031fdce43800cf782
|
2017-08-10 02:20:50 +00:00 |
|
Ajay Nadathur
|
3253b7ee7c
|
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
am: b9c3eb954a
Change-Id: Ie7d1d6bd37274ac70c87fc6b8dca5f3118a64a64
|
2017-08-10 02:20:25 +00:00 |
|
Fan Zhang
|
2b050a3663
|
Merge "Close cursor after getting data from DB" into oc-mr1-dev am: 298d559c40
am: 876513ec38
Change-Id: I9a8a0f94a1d55858bd49ffba987eb3ce11d48178
|
2017-08-10 02:20:02 +00:00 |
|
Eric Schwarzenbach
|
c03105dfb3
|
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev am: 51bde3c8fe
am: 33840ce005
Change-Id: I9a0588a9f311049b94d286cad83b4155ce94532c
|
2017-08-10 02:19:36 +00:00 |
|
Justin Klaassen
|
27ef303dd1
|
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am: d59854de24
am: 6652cfcd7e
Change-Id: I25161af9d86997b2d0808590fc0a89f8a3b16d04
|
2017-08-10 02:19:12 +00:00 |
|
TreeHugger Robot
|
d0b09f7868
|
Merge "Remove code for old wifi tether feature"
|
2017-08-10 00:08:03 +00:00 |
|
mingliang.x.lei
|
cc6b8a868d
|
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad am: c46b5e60b9
am: 8ba28798aa
Change-Id: Ib0f0e1d0ec3bbcf2223e5609bc6218f0c360a5cb
|
2017-08-10 00:06:32 +00:00 |
|
The Android Open Source Project
|
df5bd79a29
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
am: 5d13310d94 -s ours
Change-Id: I15188bd1727dca63df2ddf3cbd1435c5bfbfc79a
|
2017-08-10 00:06:08 +00:00 |
|
Daniel Nishi
|
a17d748f9b
|
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
am: 5f3f655ad2
Change-Id: I74680d46cc09148a58062c5c4f24404b6cc19713
|
2017-08-10 00:05:18 +00:00 |
|
Ruchi Kandoi
|
71a351af08
|
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
am: 3b012860db
Change-Id: I9c36d1d2f111e39a517fac319ececb7a4abf25cd
|
2017-08-10 00:04:52 +00:00 |
|
Salvador Martinez
|
5cefe64942
|
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
am: 3781030b94
Change-Id: Id6bee10ec7356c9446278d1d314d527a5bc8bdc3
|
2017-08-10 00:02:05 +00:00 |
|
qqzhou
|
add20708ba
|
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
am: 467aad4219
Change-Id: I8084bdf06e20e94a2963f5bfe590a7588a9c2e4c
|
2017-08-09 23:04:07 +00:00 |
|
Daniel Nishi
|
319c45ad51
|
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours
am: 14be0e4124 -s ours
Change-Id: Ib0be13003a7a56fb64d0f8a901bc38850627e8f8
|
2017-08-09 22:54:24 +00:00 |
|
Matthew Fritze
|
580810a738
|
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours
am: 730bad152c -s ours
Change-Id: I3a79f410b37f330deed8bdb8a6e6c7070f3ce732
|
2017-08-09 22:52:43 +00:00 |
|
The Android Open Source Project
|
71460b0859
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
am: aeee659147 -s ours
Change-Id: I446a2efc2cc4afda46abdb775ffb36044ae82983
|
2017-08-09 22:52:06 +00:00 |
|
Daniel Nishi
|
6df5c65f45
|
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
am: 8bbc28a95b
Change-Id: I2f52d59322a5b5f3960aa686adca06451ca87d13
|
2017-08-09 22:51:45 +00:00 |
|
qqzhou
|
467aad4219
|
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am: 2c2b6b48de
Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
|
2017-08-09 22:41:12 +00:00 |
|
Daniel Nishi
|
14be0e4124
|
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am: 97e0e42959 -s ours
Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396
|
2017-08-09 22:39:55 +00:00 |
|
Matthew Fritze
|
730bad152c
|
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am: 3161375f78 -s ours
Change-Id: I34e117b92e73a36f9c3c70f7c2e6b224ed308a0b
|
2017-08-09 22:38:28 +00:00 |
|
The Android Open Source Project
|
aeee659147
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: dd6d975214 -s ours
Change-Id: I2ae2cce68305a32c8f1272a46b3eb784e32b8b22
|
2017-08-09 22:37:57 +00:00 |
|
Daniel Nishi
|
8bbc28a95b
|
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am: c075f8943e
Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
|
2017-08-09 22:37:34 +00:00 |
|
TreeHugger Robot
|
2c2b6b48de
|
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
|
2017-08-09 20:57:50 +00:00 |
|
Ruchi Kandoi
|
706c6ba20e
|
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
am: bf81a17a31
Change-Id: I8ac2a1d903588f27b57b7f5993cb833100436108
|
2017-08-09 20:35:36 +00:00 |
|
Salvador Martinez
|
35c0949b2e
|
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
am: 7bc388d823
Change-Id: I33cb44239c0725efd34611c06ed1734a6898d943
|
2017-08-09 20:28:30 +00:00 |
|
Ajay Nadathur
|
b9c3eb954a
|
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am: 0ed0319005
Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
|
2017-08-09 20:27:45 +00:00 |
|
Ruchi Kandoi
|
bf81a17a31
|
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am: 9eff3f90d8
Change-Id: I35b7606035a45c1705d0d8775b55c5d7ec9aa672
|
2017-08-09 20:22:10 +00:00 |
|
Salvador Martinez
|
7bc388d823
|
Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193
Change-Id: I8dca27c407709961ed28c64b76304894d5456781
|
2017-08-09 20:21:32 +00:00 |
|
TreeHugger Robot
|
0ed0319005
|
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
|
2017-08-09 20:15:20 +00:00 |
|
Andrew Sapperstein
|
3c520f58b5
|
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b am: 92592b4c25
am: fa0f823f79
Change-Id: I0942e236ae97535b9fdeb6758cb39bea3946e0ad
|
2017-08-09 20:07:37 +00:00 |
|
Fan Zhang
|
876513ec38
|
Merge "Close cursor after getting data from DB" into oc-mr1-dev
am: 298d559c40
Change-Id: Ie93dd52be56f24d8bf5d3e12fd1ae02cb189a588
|
2017-08-09 20:05:14 +00:00 |
|
Eric Schwarzenbach
|
33840ce005
|
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
am: 51bde3c8fe
Change-Id: Ie9139274f1c472baa87121d5a6faf8c2b40b6a3f
|
2017-08-09 20:02:03 +00:00 |
|
Justin Klaassen
|
6652cfcd7e
|
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am: d59854de24
Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af
|
2017-08-09 20:01:40 +00:00 |
|
TreeHugger Robot
|
298d559c40
|
Merge "Close cursor after getting data from DB" into oc-mr1-dev
|
2017-08-09 19:58:36 +00:00 |
|
TreeHugger Robot
|
51bde3c8fe
|
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
|
2017-08-09 19:49:41 +00:00 |
|
TreeHugger Robot
|
d59854de24
|
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
|
2017-08-09 19:40:03 +00:00 |
|
Andrew Sapperstein
|
fa0f823f79
|
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
am: 92592b4c25
Change-Id: I9dea2428459cf654f1e509114f2ec97ea9e6811b
|
2017-08-09 19:33:30 +00:00 |
|
Daniel Nishi
|
97e0e42959
|
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
|
2017-08-09 19:25:35 +00:00 |
|
TreeHugger Robot
|
3161375f78
|
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
|
2017-08-09 19:15:27 +00:00 |
|
Matthew Fritze
|
e69329cc84
|
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev am: e0c0616d6f
am: f9831dc7be
Change-Id: Ic310159af3c87a4d91445806c65976457c6ae2c0
|
2017-08-09 18:57:08 +00:00 |
|