Josh Gao
|
c8dada7576
|
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
am: f3e0563949
Change-Id: I30d523ffa9576c2f075c175745097f70978fcd7a
|
2016-11-30 03:28:52 +00:00 |
|
Tianjie Xu
|
ac0fdce7cb
|
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
am: 1ff7b760e7
Change-Id: I9173f9ceca5479a3cbe4151a9a78a239af9ffad7
|
2016-11-30 03:28:32 +00:00 |
|
Tianjie Xu
|
d68d20e073
|
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
am: 8727b53a2f
Change-Id: I5b603d29528d6cb6eb0ee8c734a1ed9273fe094d
|
2016-11-30 03:28:17 +00:00 |
|
Tianjie Xu
|
2422a0db5b
|
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
am: 5a97ef91d8
Change-Id: I613ef805bc6d4a59f05b89032490fb90c2c2bab7
|
2016-11-30 03:28:02 +00:00 |
|
Tom Cherry
|
f19a1fcc90
|
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
am: 524afcec4a
Change-Id: I80326f8588a36674d0016df12e4f5f5f70c999a3
|
2016-11-30 03:27:47 +00:00 |
|
Josh Gao
|
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
Change-Id: I28568920fc02c088cd64f4b3735715b79609c08b
|
2016-11-30 03:23:23 +00:00 |
|
Tianjie Xu
|
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
Change-Id: I95bf69ba65c31b417d3ac289b8ce4d53a4b171d5
|
2016-11-30 03:23:04 +00:00 |
|
Tianjie Xu
|
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
Change-Id: I4f99361952a8166d79de0296b67369fe3a8cc49d
|
2016-11-30 03:22:46 +00:00 |
|
Tianjie Xu
|
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
Change-Id: I49235c1cc83203231fe8a73f89017d907e507714
|
2016-11-30 03:22:29 +00:00 |
|
Tom Cherry
|
524afcec4a
|
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
Change-Id: I20f24693f201f1a15ded1fd6dfb6d56a58ebcaa8
|
2016-11-29 17:17:26 -08:00 |
|
Nick Vaccaro
|
a441881e15
|
healthd: Show animation before waiting on timer am: 6f8314900f
am: 9291de89b9
Change-Id: I59c149d8fe56b99b60c03a337fb957718d58e528
|
2016-11-29 21:46:04 +00:00 |
|
Nick Vaccaro
|
1f7184897f
|
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev am: 085c91bedd
am: d918b70712
Change-Id: I508982e546323891b7a4a46e453bfb57be04138a
|
2016-11-29 21:45:50 +00:00 |
|
Nick Vaccaro
|
89e09e5aeb
|
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am: b892613793
Change-Id: If0920edc835679c9ec1966d3d04c88a578d9757e
|
2016-11-29 21:45:27 +00:00 |
|
Nick Vaccaro
|
f026d11edf
|
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
am: 485c647432
Change-Id: I71812e3469303c927fa48f8d23d866c0d5e819c5
|
2016-11-29 21:45:26 +00:00 |
|
Nick Vaccaro
|
9291de89b9
|
healthd: Show animation before waiting on timer
am: 6f8314900f
Change-Id: I4fd5665ff1b7ce646aa0b515aeb38152a340d8a1
|
2016-11-29 21:40:59 +00:00 |
|
Nick Vaccaro
|
d918b70712
|
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev
am: 085c91bedd
Change-Id: I9cc1f7208431c64fb05aff91853d848244a2c027
|
2016-11-29 21:40:44 +00:00 |
|
Nick Vaccaro
|
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 |
|
Mark Salyzyn
|
f1f765e454
|
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b am: 10f4044341
am: 857230c5d9
Change-Id: I31deb62d1e2263f403c85ca392d57e8616138a22
|
2016-11-29 19:57:19 +00:00 |
|
Mark Salyzyn
|
857230c5d9
|
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b
am: 10f4044341
Change-Id: I281613e742ea3ea5e2ff993a24bd569659aeb66d
|
2016-11-29 19:51:50 +00:00 |
|
Mark Salyzyn
|
10f4044341
|
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
am: 9bfd9f558b
Change-Id: Ief7fcc4f7dd8086186b38c091fed626560ca7215
|
2016-11-29 19:46:50 +00:00 |
|
Treehugger Robot
|
9bfd9f558b
|
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
|
2016-11-29 19:37:48 +00:00 |
|
Nick Vaccaro
|
485c647432
|
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
|
2016-11-29 11:28:26 -08:00 |
|
Damien Bargiacchi
|
b0686f88cf
|
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213e8
am: f2fabc9926
Change-Id: I73047338741bba452010957197c922ed1354f9a1
|
2016-11-29 19:16:45 +00:00 |
|
Damien Bargiacchi
|
bbff20dc1d
|
Always show the battery percentage unless it is unknown am: 3f0250c3cc
am: fdce0878f1
Change-Id: I5d3eca6bb9a8c0c1f2f3d318f8452ae03ec7dd84
|
2016-11-29 19:16:30 +00:00 |
|
Nick Vaccaro
|
7216ba476f
|
Merge "healthd: allow override of wake interval timing" into cw-f-dev am: a1be7d1bb5
am: 610e0ec98f
Change-Id: Ife5308dd430ca75391a72457ed05642d4a656426
|
2016-11-29 19:16:11 +00:00 |
|
Nick Vaccaro
|
e5f6c292ca
|
Merge "resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am: 75c815251c
Change-Id: I0a55381fd4b7f66e79bc6d8a725cfa1d9004255a
|
2016-11-29 19:15:49 +00:00 |
|
Nick Vaccaro
|
4cf68bd5e4
|
resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp
am: 1e811fca22
Change-Id: Ifeb99e360cdea1db9fa54f5d7a1561ba4f2626f5
|
2016-11-29 19:15:48 +00:00 |
|
Damien Bargiacchi
|
f2fabc9926
|
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev
am: cd542213e8
Change-Id: Ia18309b80e0b628e2f1e2a08818195dc141ec5f5
|
2016-11-29 19:10:59 +00:00 |
|
Damien Bargiacchi
|
fdce0878f1
|
Always show the battery percentage unless it is unknown
am: 3f0250c3cc
Change-Id: If5027f2fc94aaf1f2db1d6df79866185e2cfe86d
|
2016-11-29 19:10:58 +00:00 |
|
Nick Vaccaro
|
610e0ec98f
|
Merge "healthd: allow override of wake interval timing" into cw-f-dev
am: a1be7d1bb5
Change-Id: I5f8518d908d6ec1cc5b9a40d0e62a31fa212c517
|
2016-11-29 19:10:41 +00:00 |
|
Nick Vaccaro
|
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 |
|
Josh Gao
|
77a97a62d0
|
Merge changes I1d03564f,I883e4e6c am: 5b21deb786 am: c58f49bf1b
am: 0c484ca04a
Change-Id: I74bae9e331ecfb3f98acc4ef6e2f40811d1a3f7e
|
2016-11-29 18:28:53 +00:00 |
|
Josh Gao
|
299ddad6ee
|
adb: be more permissive in test_push_error_reporting. am: 79ce3fe7db am: b6e9e5ddde
am: dfeb4ae52b
Change-Id: I0d608756f56b5ebfce9e273747a9ca6aeb1969a9
|
2016-11-29 18:28:49 +00:00 |
|
Josh Gao
|
22436ab727
|
adb: make sure that file mode macros match linux. am: 05a3abfef3 am: 68fd28e334
am: ebccf90991
Change-Id: I9c06688cd4590a7f911bfdf4dde11241409828eb
|
2016-11-29 18:28:44 +00:00 |
|
Josh Gao
|
0c484ca04a
|
Merge changes I1d03564f,I883e4e6c am: 5b21deb786
am: c58f49bf1b
Change-Id: Ie3c79101d3e81538de0ba72d587c927be4fd4b53
|
2016-11-29 18:23:56 +00:00 |
|
Josh Gao
|
dfeb4ae52b
|
adb: be more permissive in test_push_error_reporting. am: 79ce3fe7db
am: b6e9e5ddde
Change-Id: Ic163698b4482d64add36c9cebafaff6e62c3c949
|
2016-11-29 18:23:50 +00:00 |
|
Elliott Hughes
|
e12635cc34
|
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60 am: c509c36892
am: 83b8df0e8c
Change-Id: I2dcbc2315f282ba87cf69d105ff2dbc9e6ebfc1d
|
2016-11-29 18:23:44 +00:00 |
|
Josh Gao
|
ebccf90991
|
adb: make sure that file mode macros match linux. am: 05a3abfef3
am: 68fd28e334
Change-Id: I916140ca332f33f963ca531399f4da31b5ae65d3
|
2016-11-29 18:23:44 +00:00 |
|
Josh Gao
|
c58f49bf1b
|
Merge changes I1d03564f,I883e4e6c
am: 5b21deb786
Change-Id: I0a92e6f94174c76731159957172a6596cb9147ce
|
2016-11-29 18:18:50 +00:00 |
|
Josh Gao
|
b6e9e5ddde
|
adb: be more permissive in test_push_error_reporting.
am: 79ce3fe7db
Change-Id: I1239b5af85edca9ae6fa1a38f755b5707bbc614b
|
2016-11-29 18:18:49 +00:00 |
|
Josh Gao
|
68fd28e334
|
adb: make sure that file mode macros match linux.
am: 05a3abfef3
Change-Id: I39a6938adc8b9b1da0185d36a1891f755bf2ca38
|
2016-11-29 18:18:44 +00:00 |
|
Elliott Hughes
|
83b8df0e8c
|
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60
am: c509c36892
Change-Id: I081414e6eff9c9bae3b9152760da580439d376aa
|
2016-11-29 18:18:43 +00:00 |
|
Elliott Hughes
|
c509c36892
|
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
am: a10bd47d60
Change-Id: Ibad56dbe843c16863a70552ea27aa3e7ffca0787
|
2016-11-29 18:14:19 +00:00 |
|
Treehugger Robot
|
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 |
|
Treehugger Robot
|
a10bd47d60
|
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
|
2016-11-29 18:05:51 +00:00 |
|
Billy Lau
|
d885cfbef1
|
Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17 am: 6be1d976f6
am: 93d6a6fada
Change-Id: I824f32d950d089b178bdb8e3abfbb83f3a8ed370
|
2016-11-29 16:46:37 +00:00 |
|
Billy Lau
|
93d6a6fada
|
Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17
am: 6be1d976f6
Change-Id: Ibcd178a0173e45ba32dbdd724436f0a4389df021
|
2016-11-29 16:41:38 +00:00 |
|
Billy Lau
|
6be1d976f6
|
Merge "init: Reworked how we wait for COLDBOOT_DONE"
am: 57c31d0f17
Change-Id: I40c0183e3bc22bc85977e4e8db3b4ce6ad76375e
|
2016-11-29 16:36:37 +00:00 |
|
Elliott Hughes
|
a452660d92
|
Revert "init: Reworked how we wait for COLDBOOT_DONE"
This reverts commit d36115ef2f.
Change-Id: I599b0eeebf9c062852323f2a4a986b18dd85288a
|
2016-11-29 16:34:56 +00:00 |
|
Billy Lau
|
57c31d0f17
|
Merge "init: Reworked how we wait for COLDBOOT_DONE"
|
2016-11-29 16:31:12 +00:00 |