8035a63a38
Merge "debuggerd: Dump list of open files on process crash." am: b675f7cd32
...
am: 3ff028c7db
2016-11-30 09:23:56 +00:00
3ff028c7db
Merge "debuggerd: Dump list of open files on process crash."
...
am: b675f7cd32
2016-11-30 09:18:57 +00:00
b675f7cd32
Merge "debuggerd: Dump list of open files on process crash."
2016-11-30 07:53:09 +00:00
fa807c7cad
Merge changes Ia0ca36fc,Ib42c0635 am: 1abc3cd641
...
am: 695e6182d3
2016-11-30 06:12:15 +00:00
fb1a1dbe6c
Enable liblog on host bionic am: 0910d2dbb9
...
am: 32010171bd
2016-11-30 06:12:07 +00:00
5bc670c841
Enable libbase/libutils/libziparchive on host bionic am: ab34b47b35
...
am: 69b0123549
2016-11-30 06:12:00 +00:00
695e6182d3
Merge changes Ia0ca36fc,Ib42c0635
...
am: 1abc3cd641
2016-11-30 06:06:07 +00:00
32010171bd
Enable liblog on host bionic
...
am: 0910d2dbb9
2016-11-30 06:06:06 +00:00
69b0123549
Enable libbase/libutils/libziparchive on host bionic
...
am: ab34b47b35
2016-11-30 06:05:59 +00:00
1abc3cd641
Merge changes Ia0ca36fc,Ib42c0635
...
* changes:
Enable liblog on host bionic
Enable libbase/libutils/libziparchive on host bionic
2016-11-30 05:59:53 +00:00
8c0d6338f3
Merge "Switch sdcardfs over to bind mounts." am: 94b9e4df04
...
am: 895cd44bd9
2016-11-30 05:26:10 +00:00
895cd44bd9
Merge "Switch sdcardfs over to bind mounts."
...
am: 94b9e4df04
2016-11-30 05:20:40 +00:00
94b9e4df04
Merge "Switch sdcardfs over to bind mounts."
2016-11-30 05:15:33 +00:00
1523ff3952
Merge "delete toolbox/r.c" am: 08f0c4c998
...
am: 604ed83934
2016-11-30 04:37:54 +00:00
604ed83934
Merge "delete toolbox/r.c"
...
am: 08f0c4c998
2016-11-30 04:32:54 +00:00
08f0c4c998
Merge "delete toolbox/r.c"
2016-11-30 04:27:32 +00:00
effc9de94a
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d
...
am: 79517d4f9f
2016-11-30 03:24:30 +00:00
d85207481e
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280
...
am: 8dab84a673
2016-11-30 03:24:14 +00:00
cfbf6d71a9
fs_mgr: Fix disable-verity for verifyatboot partitions
...
am: dd78ae75ff
2016-11-30 03:23:57 +00:00
641a541a6f
Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90
...
am: b928a3485a
2016-11-30 03:23:42 +00:00
f3e0563949
adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a am: 2a201fff82
...
am: a198e406c8
2016-11-30 03:23:23 +00:00
1ff7b760e7
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours am: af7dbf4d7a am: b01cb2a926 -s ours am: 778fff4ae8 am: 4e37d97d61 am: 0735bfdd3a am: d540186b0d -s ours am: f6e21cb1f8 am: dd11742510 am: 4f99cb9cb9
...
am: 268bdfb840
2016-11-30 03:23:04 +00:00
8727b53a2f
Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960 am: fb3d3904d0 -s ours am: 4b9c44dcf7 am: cc236b7e94 am: 76af41ef0a am: 18b8b0f168 -s ours am: 3ef91bbffa am: 0da14e91c6 am: 5e10383130
...
am: 80dc7605b9
2016-11-30 03:22:46 +00:00
5a97ef91d8
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564 am: 466a521607 -s ours am: ea11f5547c am: f93261010a am: 6a40db71f7 am: fc6c0a3480 -s ours am: 9df391f156 am: ab177b77f7 am: acdde34428
...
am: c706c7ffcc
2016-11-30 03:22:29 +00:00
524afcec4a
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
...
Change-Id: I20f24693f201f1a15ded1fd6dfb6d56a58ebcaa8
2016-11-29 17:17:26 -08:00
8a475f7e4a
delete toolbox/r.c
...
/dev/mem has been turned off on all Android kernels (b/19549480). This
utility cannot be used.
Test: android compiles.
Change-Id: I500021f224febb15dd8bfe6e1f6e5c398fe6f552
2016-11-29 15:45:11 -08:00
9291de89b9
healthd: Show animation before waiting on timer
...
am: 6f8314900f
2016-11-29 21:40:59 +00:00
d918b70712
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev
...
am: 085c91bedd
2016-11-29 21:40:44 +00:00
0910d2dbb9
Enable liblog on host bionic
...
Some of the __BIONIC__ checks were actually looking for an android
device. Host bionic has __BIONIC__, but not __ANDROID__.
Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ia0ca36fc9486fe8ea7e5d1b2e26ab0491903723c
2016-11-29 13:39:55 -08:00
b892613793
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-11-29 21:39:14 +00:00
ab34b47b35
Enable libbase/libutils/libziparchive on host bionic
...
Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ib42c063532c1cbeb3e1418ab16a1fb54d5902aab
2016-11-29 13:38:53 -08:00
857230c5d9
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b
...
am: 10f4044341
2016-11-29 19:51:50 +00:00
10f4044341
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
...
am: 9bfd9f558b
2016-11-29 19:46:50 +00:00
9bfd9f558b
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
2016-11-29 19:37:48 +00:00
485c647432
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
...
Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
2016-11-29 11:28:26 -08:00
f2fabc9926
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev
...
am: cd542213e8
2016-11-29 19:10:59 +00:00
fdce0878f1
Always show the battery percentage unless it is unknown
...
am: 3f0250c3cc
2016-11-29 19:10:58 +00:00
610e0ec98f
Merge "healthd: allow override of wake interval timing" into cw-f-dev
...
am: a1be7d1bb5
2016-11-29 19:10:41 +00:00
75c815251c
Merge "resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-11-29 19:08:45 +00:00
0c484ca04a
Merge changes I1d03564f,I883e4e6c am: 5b21deb786
...
am: c58f49bf1b
2016-11-29 18:23:56 +00:00
dfeb4ae52b
adb: be more permissive in test_push_error_reporting. am: 79ce3fe7db
...
am: b6e9e5ddde
2016-11-29 18:23:50 +00:00
ebccf90991
adb: make sure that file mode macros match linux. am: 05a3abfef3
...
am: 68fd28e334
2016-11-29 18:23:44 +00:00
c58f49bf1b
Merge changes I1d03564f,I883e4e6c
...
am: 5b21deb786
2016-11-29 18:18:50 +00:00
b6e9e5ddde
adb: be more permissive in test_push_error_reporting.
...
am: 79ce3fe7db
2016-11-29 18:18:49 +00:00
68fd28e334
adb: make sure that file mode macros match linux.
...
am: 05a3abfef3
2016-11-29 18:18:44 +00:00
83b8df0e8c
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60
...
am: c509c36892
2016-11-29 18:18:43 +00:00
c509c36892
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
...
am: a10bd47d60
2016-11-29 18:14:19 +00:00
5b21deb786
Merge changes I1d03564f,I883e4e6c
...
* changes:
adb: be more permissive in test_push_error_reporting.
adb: make sure that file mode macros match linux.
2016-11-29 18:13:07 +00:00
a10bd47d60
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
2016-11-29 18:05:51 +00:00
93d6a6fada
Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17
...
am: 6be1d976f6
2016-11-29 16:41:38 +00:00
Richard Uhler