Automerger Merge Worker
|
3f963835ff
|
Merge "libcutils: fallback to /dev/ashmem" am: 6e016ef80e am: 0714a9eae2 am: 315d44f02c
Change-Id: I334c8988af63a49dab7ace5045b9a792eb0050b2
|
2020-01-15 20:17:28 +00:00 |
|
Automerger Merge Worker
|
6be39c5912
|
Merge "Create /mnt/data_mirror/cur_profiles in init.rc" am: ec7be0dc0f am: 3fabcf5fcf am: a2adbc7405
Change-Id: I2035bd8f1b723a9dc41fb2e69dfcc23357360f3a
|
2020-01-15 20:17:04 +00:00 |
|
Automerger Merge Worker
|
315d44f02c
|
Merge "libcutils: fallback to /dev/ashmem" am: 6e016ef80e am: 0714a9eae2
Change-Id: I18000e3aed6ee3b5f5a2bbf0975f12ca85400a72
|
2020-01-15 20:04:38 +00:00 |
|
Automerger Merge Worker
|
a2adbc7405
|
Merge "Create /mnt/data_mirror/cur_profiles in init.rc" am: ec7be0dc0f am: 3fabcf5fcf
Change-Id: I1f6b0306ce232cd471f4b7c75e7c84ba21f82eac
|
2020-01-15 20:04:25 +00:00 |
|
Steven Moreland
|
0714a9eae2
|
Merge "libcutils: fallback to /dev/ashmem"
am: 6e016ef80e
Change-Id: Ie8fcbadf4841a0b8537657598cd5dc1a01742f67
|
2020-01-15 11:51:00 -08:00 |
|
Ricky Wai
|
3fabcf5fcf
|
Merge "Create /mnt/data_mirror/cur_profiles in init.rc"
am: ec7be0dc0f
Change-Id: Ic4fd8ca304f95a475470eae390e79aee83c3d7db
|
2020-01-15 11:50:29 -08:00 |
|
Treehugger Robot
|
6e016ef80e
|
Merge "libcutils: fallback to /dev/ashmem"
|
2020-01-15 19:48:26 +00:00 |
|
Treehugger Robot
|
ec7be0dc0f
|
Merge "Create /mnt/data_mirror/cur_profiles in init.rc"
|
2020-01-15 19:47:52 +00:00 |
|
Automerger Merge Worker
|
1c4fed9344
|
Merge "liblog: remove log_portability.h" am: e2dad0a296 am: 45f06c49fa am: f29a1a65f3
Change-Id: I749d07651b4529f52db2064185b2b639b13c8289
|
2020-01-15 16:43:09 +00:00 |
|
Automerger Merge Worker
|
f745985d7c
|
Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY" am: 2ea787137f am: 902c974556 am: c84504bf53
Change-Id: I5eddd7707094d4b2049f8107e725cc3abc0ede43
|
2020-01-15 16:42:57 +00:00 |
|
Automerger Merge Worker
|
f29a1a65f3
|
Merge "liblog: remove log_portability.h" am: e2dad0a296 am: 45f06c49fa
Change-Id: If3e9781e5713a17c4816c178ca7d8c5cdc62374e
|
2020-01-15 16:28:42 +00:00 |
|
Automerger Merge Worker
|
c84504bf53
|
Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY" am: 2ea787137f am: 902c974556
Change-Id: I4211adc8ed161e871356fba83205556e78dc0238
|
2020-01-15 16:28:33 +00:00 |
|
Tom Cherry
|
45f06c49fa
|
Merge "liblog: remove log_portability.h"
am: e2dad0a296
Change-Id: I24befb7f47f376697e2d121f5e18933cb81e2c37
|
2020-01-15 08:12:29 -08:00 |
|
Tom Cherry
|
902c974556
|
Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY"
am: 2ea787137f
Change-Id: I8e77472bb4eaa1b046892e866f0b19411169f368
|
2020-01-15 08:11:51 -08:00 |
|
Tom Cherry
|
e2dad0a296
|
Merge "liblog: remove log_portability.h"
|
2020-01-15 16:10:30 +00:00 |
|
Tom Cherry
|
2ea787137f
|
Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY"
|
2020-01-15 16:09:45 +00:00 |
|
Automerger Merge Worker
|
275ab0b357
|
Merge "Change scope of ro.init.userspace_reboot.is_supported to public" am: 60ddf3a29a am: 03fd199578 am: cdea887a1f
Change-Id: I1861d5466ec021484095d6f1c6ff83079aae2f3c
|
2020-01-15 14:44:20 +00:00 |
|
Automerger Merge Worker
|
9ba6c50491
|
Merge "Refactor update status management as protobuf" am: 5c63dc9322 am: 122035fd3a am: f36e554b3c
Change-Id: I4cdb17d4e87f9bc7151812663618bec22055083b
|
2020-01-15 14:43:50 +00:00 |
|
Automerger Merge Worker
|
d20c05c9c4
|
Merge "Disable dm-verity hash prefetching." am: e4505960b9 am: 4cde8c3eaa am: 95d0330eab
Change-Id: I32733101a1d1bcf536865974612b2dcee55ccb03
|
2020-01-15 14:39:42 +00:00 |
|
Automerger Merge Worker
|
cdea887a1f
|
Merge "Change scope of ro.init.userspace_reboot.is_supported to public" am: 60ddf3a29a am: 03fd199578
Change-Id: I747cc8c44defb017b090fcdc5e033b3b617ab28c
|
2020-01-15 14:23:55 +00:00 |
|
Automerger Merge Worker
|
f36e554b3c
|
Merge "Refactor update status management as protobuf" am: 5c63dc9322 am: 122035fd3a
Change-Id: Ia1021971d26541312ca9c9260495b13ce2c527ce
|
2020-01-15 14:23:40 +00:00 |
|
Automerger Merge Worker
|
95d0330eab
|
Merge "Disable dm-verity hash prefetching." am: e4505960b9 am: 4cde8c3eaa
Change-Id: I9d30f108fe340772ca7bd9e5e316da5150f3a3e6
|
2020-01-15 14:23:20 +00:00 |
|
Nikita Ioffe
|
03fd199578
|
Merge "Change scope of ro.init.userspace_reboot.is_supported to public"
am: 60ddf3a29a
Change-Id: I3c67b57b6ea6be072b2cf8166ee92bd1908d8b1c
|
2020-01-15 06:18:01 -08:00 |
|
Nikita Ioffe
|
60ddf3a29a
|
Merge "Change scope of ro.init.userspace_reboot.is_supported to public"
|
2020-01-15 14:14:08 +00:00 |
|
Alessio Balsini
|
122035fd3a
|
Merge "Refactor update status management as protobuf"
am: 5c63dc9322
Change-Id: I9a995365cbbf354a8f3da09f1d900d9e52b5e4a9
|
2020-01-15 06:07:46 -08:00 |
|
Martijn Coenen
|
4cde8c3eaa
|
Merge "Disable dm-verity hash prefetching."
am: e4505960b9
Change-Id: I844c05358e1d100feacb047124c975a4d86a23d8
|
2020-01-15 06:05:48 -08:00 |
|
Treehugger Robot
|
5c63dc9322
|
Merge "Refactor update status management as protobuf"
|
2020-01-15 14:04:25 +00:00 |
|
Treehugger Robot
|
e4505960b9
|
Merge "Disable dm-verity hash prefetching."
|
2020-01-15 13:13:01 +00:00 |
|
Automerger Merge Worker
|
34663c216a
|
Merge "[incrementa;] set mode and encryption for /data/incremental" am: f7593a9a2a am: bed2e0c828 am: a5e455423d
Change-Id: If09c3eee19bec544929a3b2a472effcc8be0e077
|
2020-01-15 03:35:44 +00:00 |
|
Automerger Merge Worker
|
a5e455423d
|
Merge "[incrementa;] set mode and encryption for /data/incremental" am: f7593a9a2a am: bed2e0c828
Change-Id: I4d66d07e66825b999c4e0c461c4fbf19b72b8054
|
2020-01-15 03:24:07 +00:00 |
|
Songchun Fan
|
bed2e0c828
|
Merge "[incrementa;] set mode and encryption for /data/incremental"
am: f7593a9a2a
Change-Id: I491bbbeac963e58770eaa4d76e418bf4dfa08a41
|
2020-01-14 19:06:25 -08:00 |
|
Treehugger Robot
|
f7593a9a2a
|
Merge "[incrementa;] set mode and encryption for /data/incremental"
|
2020-01-15 02:58:02 +00:00 |
|
Automerger Merge Worker
|
3212be82b5
|
Merge "remove deprecated bp 'subdirs'" am: aba02dbe6e am: 22197eaea7 am: d765a4bcca
Change-Id: Ibebab4ec0f4948c015e697050d121046cdf5ab42
|
2020-01-15 02:27:14 +00:00 |
|
Automerger Merge Worker
|
d765a4bcca
|
Merge "remove deprecated bp 'subdirs'" am: aba02dbe6e am: 22197eaea7
Change-Id: I1fa6f86992ac255469fc6958b7d7ef0659b0c8f7
|
2020-01-15 02:13:35 +00:00 |
|
Steven Moreland
|
22197eaea7
|
Merge "remove deprecated bp 'subdirs'"
am: aba02dbe6e
Change-Id: I76fa69b2a3e68e3a1df3bf3fe233d84ff4bf4423
|
2020-01-14 18:02:25 -08:00 |
|
Automerger Merge Worker
|
9d4f1a4de8
|
Merge "fastboot: Mount /metadata before overlayfs teardown." am: 38f3706ab3 am: d12410d2f9 am: 1cd4fc99ef
Change-Id: I9c1dd7730ce4050c5f9cbe58c9041d9f6ff081be
|
2020-01-15 01:49:54 +00:00 |
|
Automerger Merge Worker
|
306caa99a7
|
Merge "Add unique_fd::operator{==,!=} overloads that take a unique_fd." am: 9ef741ccac am: bba5ea0622 am: 04c6ffbafa
Change-Id: I79b0a4326e91934482b140ef32707704a3685a74
|
2020-01-15 01:49:35 +00:00 |
|
Automerger Merge Worker
|
1cd4fc99ef
|
Merge "fastboot: Mount /metadata before overlayfs teardown." am: 38f3706ab3 am: d12410d2f9
Change-Id: I51d74369288edd7935ea655eab5e1c9f329c7e00
|
2020-01-15 01:37:28 +00:00 |
|
Treehugger Robot
|
aba02dbe6e
|
Merge "remove deprecated bp 'subdirs'"
|
2020-01-15 01:37:27 +00:00 |
|
Automerger Merge Worker
|
04c6ffbafa
|
Merge "Add unique_fd::operator{==,!=} overloads that take a unique_fd." am: 9ef741ccac am: bba5ea0622
Change-Id: I5a2dee200b80455cad9474d8d20053e06c09c32e
|
2020-01-15 01:37:17 +00:00 |
|
Yifan Hong
|
d12410d2f9
|
Merge "fastboot: Mount /metadata before overlayfs teardown."
am: 38f3706ab3
Change-Id: Ibe451d178c80a040773fbd929cb1949db5737469
|
2020-01-14 17:33:39 -08:00 |
|
Yifan Hong
|
38f3706ab3
|
Merge "fastboot: Mount /metadata before overlayfs teardown."
|
2020-01-15 01:31:59 +00:00 |
|
Peter Collingbourne
|
bba5ea0622
|
Merge "Add unique_fd::operator{==,!=} overloads that take a unique_fd."
am: 9ef741ccac
Change-Id: Ie361658e875008f06bb8d50e476ce0c9ef377aa6
|
2020-01-14 17:25:44 -08:00 |
|
Peter Collingbourne
|
9ef741ccac
|
Merge "Add unique_fd::operator{==,!=} overloads that take a unique_fd."
|
2020-01-15 01:24:01 +00:00 |
|
Automerger Merge Worker
|
9e7bfb3f60
|
Merge changes from topic "remove-log_to" am: acd17330df am: a5d5040108 am: 41ec896530
Change-Id: I4f12897e99b4544c77d0b216b4572e910abeb1df
|
2020-01-15 00:12:19 +00:00 |
|
Automerger Merge Worker
|
0dcd36f71f
|
storaged: replace LOG_TO() macros with LOG() am: b8c1147c4a am: f06cfd7fe4 am: 1a382e3246
Change-Id: Iad076aacb2d90105c53806120f46762de46c4117
|
2020-01-15 00:12:17 +00:00 |
|
Automerger Merge Worker
|
41ec896530
|
Merge changes from topic "remove-log_to" am: acd17330df am: a5d5040108
Change-Id: I1f1a52c0eba153a3980d820d5e258bdb6a3be8b1
|
2020-01-14 23:59:55 +00:00 |
|
Automerger Merge Worker
|
1a382e3246
|
storaged: replace LOG_TO() macros with LOG() am: b8c1147c4a am: f06cfd7fe4
Change-Id: I26a2e144351a9c72ac966fd43bb55f543ddd50ea
|
2020-01-14 23:59:52 +00:00 |
|
Tom Cherry
|
a5d5040108
|
Merge changes from topic "remove-log_to"
am: acd17330df
Change-Id: I910aa933ac8a1393c1bcac56b5cc12c1602c2095
|
2020-01-14 14:18:23 -08:00 |
|
Tom Cherry
|
f06cfd7fe4
|
storaged: replace LOG_TO() macros with LOG()
am: b8c1147c4a
Change-Id: I75b9569172694f57951a4462e57e36dbee702e72
|
2020-01-14 14:18:18 -08:00 |
|