Elliott Hughes
|
9d33b7773f
|
am 8a8953bb: (-s ours) Fix libcutils build.
* commit '8a8953bb3dcad58c560e4c6247b7897a2a6122d1':
Fix libcutils build.
|
2015-08-27 11:46:05 +00:00 |
|
Elliott Hughes
|
51e69ca124
|
am 3dced0d2: (-s ours) am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check."
* commit '3dced0d2c6000d1d77fd2ada83a9853734367cbc':
|
2015-08-27 11:45:51 +00:00 |
|
Elliott Hughes
|
d2d83da4e4
|
am 8b262b9d: (-s ours) resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp
* commit '8b262b9de4defd234ec3593453bfb1dba4642151':
|
2015-08-27 11:45:41 +00:00 |
|
Yabin Cui
|
92e245e8f6
|
am a6d23bd6: (-s ours) am 10821da3: am 8a502000: Merge "init: expand_props for onrestart commands."
* commit 'a6d23bd6d2c31c1de69a97d78ab1e557bedcc04a':
|
2015-08-27 11:45:31 +00:00 |
|
Yabin Cui
|
0a963c8486
|
am 57eb040b: (-s ours) am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins."
* commit '57eb040ba94a4bd415ff5a71901643332dad493b':
|
2015-08-27 11:45:22 +00:00 |
|
Elliott Hughes
|
21d1aa1061
|
am 5bd3c3bb: (-s ours) am b8fa711f: am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."
* commit '5bd3c3bb5435e2b7cfe521875776a11ddfe3cabd':
|
2015-08-27 11:45:13 +00:00 |
|
Jeff Vander Stoep
|
941c6e78f5
|
am c200e956: (-s ours) am 3f62a020: logd: allow logd to write to /dev/cpuset files
* commit 'c200e9564b3ec7eea4b55badbeb0882c9674513d':
|
2015-08-27 11:44:55 +00:00 |
|
Elliott Hughes
|
d0c94f5bab
|
am 187afaf5: (-s ours) am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit '187afaf54f76f4a4a2598de7c66f8ecf32c0ee2a':
|
2015-08-27 11:44:46 +00:00 |
|
Elliott Hughes
|
c14a92c1fc
|
am 994e9ea7: (-s ours) am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit '994e9ea787dbfa584f83b77a0c49277351c7113b':
|
2015-08-27 11:44:29 +00:00 |
|
Elliott Hughes
|
674641eba4
|
am 4bc35f3e: (-s ours) am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build."
* commit '4bc35f3e4ce5ec94f70bed6ac78cbc8ea186448f':
|
2015-08-27 11:44:12 +00:00 |
|
Yabin Cui
|
5f1b750de9
|
am 62b3f91d: (-s ours) am bff40697: am addf7a96: Merge "init: Let property_get return std::string."
* commit '62b3f91d142e8c0b698729d3d7f3f4a9b8924c2f':
|
2015-08-27 11:43:58 +00:00 |
|
Elliott Hughes
|
fa6cfef507
|
am 5937a860: (-s ours) am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly."
* commit '5937a860f3ad87138956116b9cb0ffbac703c547':
|
2015-08-27 11:43:46 +00:00 |
|
Elliott Hughes
|
ebac99cfc1
|
am b877d72a: (-s ours) am f5defe75: am 89cc750e: Merge "Don\'t limit Windows USB reads."
* commit 'b877d72a86b949078eb8dbdb3442d2e2eda5c4f8':
|
2015-08-27 11:43:34 +00:00 |
|
Elliott Hughes
|
86598d1380
|
am d704ede3: (-s ours) am 2fc8a91e: am 6b40d0aa: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
* commit 'd704ede39253c1b28900c54b57f7dc57cb0367e8':
|
2015-08-27 11:43:17 +00:00 |
|
Elliott Hughes
|
431ef0a73c
|
am ae18667f: (-s ours) am d804c6cd: am 571c8d71: Merge "Increase size of the the adb packets sent over the wire"
* commit 'ae18667f9423dcd92c0d2f00e8496b4d2d370167':
|
2015-08-27 11:43:10 +00:00 |
|
Elliott Hughes
|
16ec2e6613
|
am dd7fb9af: (-s ours) am 7f12fa27: am f5b46079: Merge "init: use init\'s property expansion code for mount_all"
* commit 'dd7fb9af1f1be158b900d1b0571a8a238ed6eed5':
|
2015-08-27 11:42:54 +00:00 |
|
Mark Salyzyn
|
96a9ae4c5e
|
am 736c238b: (-s ours) am deee35d7: am 3f1d7ebb: Merge "logd: refine is_prio"
* commit '736c238b8f526ae9c53364bd6141d415d903185e':
|
2015-08-27 11:42:47 +00:00 |
|
Elliott Hughes
|
ef11e8f91e
|
am bd83f19f: (-s ours) am 32b4d786: am a5d0ca4f: Merge "Show "(reverse)" in "adb reverse --list"."
* commit 'bd83f19f687f8000537ff884280a504cd643d049':
|
2015-08-27 11:42:40 +00:00 |
|
Mark Salyzyn
|
0381c9264e
|
am 3542f3da: (-s ours) am 7b0bb824: am 93adb524: Merge "init: Fix logging stutter"
* commit '3542f3dafae3d9bed5fecb09281726d09d4b13f9':
|
2015-08-27 11:42:32 +00:00 |
|
Mark Salyzyn
|
d9306b5de2
|
am f6aaed80: (-s ours) am 18fc744f: am 6743dab5: Merge "init: Add additional logging levels"
* commit 'f6aaed8020ed4d7df3211ce9c0a4e2dd0bc6972d':
|
2015-08-27 11:42:14 +00:00 |
|
Elliott Hughes
|
2ae7d6c16c
|
am fee06481: (-s ours) am d66e949b: am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument."
* commit 'fee06481213be7c2c5ba772bc45e56baa7802a95':
|
2015-08-27 11:42:04 +00:00 |
|
Elliott Hughes
|
267385378e
|
am c83614a8: (-s ours) am 59ae3947: am 3bcdaa28: Merge "Recognize IPv6 addresses for "adb connect"."
* commit 'c83614a8a5e3864ad423415fa76a3a503a92f337':
|
2015-08-27 11:41:51 +00:00 |
|
Elliott Hughes
|
8a8ae43b08
|
am cc07811e: (-s ours) am 3cd33a72: am 5208d551: Merge "adb: logging: newlines, thread ids, error code overwriting"
* commit 'cc07811ebb4f42109ae9ef1414e1a24d8cf54a9d':
|
2015-08-27 11:41:41 +00:00 |
|
Yusuke Sato
|
ed39479f0c
|
am 7c842b57: (-s ours) am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot"
* commit '7c842b57fe5b81802b35b5de1572956981a7ea22':
|
2015-08-27 11:41:22 +00:00 |
|
Elliott Hughes
|
c8e195d672
|
am ac6a325e: (-s ours) am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST."
* commit 'ac6a325e5c2e2c852d4a5375743f17a29a372df9':
|
2015-08-27 11:41:11 +00:00 |
|
Daniel Rosenberg
|
57b3c85134
|
am d2bb8134: (-s ours) am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk"
* commit 'd2bb8134d337d35c6abfcf57a8a6c754fdba9d45':
|
2015-08-27 11:40:56 +00:00 |
|
Elliott Hughes
|
68b452b9ef
|
am 0f9b94e2: (-s ours) am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."
* commit '0f9b94e21d6db64abaf026e84b544d32364f99bf':
|
2015-08-27 11:40:45 +00:00 |
|
Daniel Erat
|
430e86ca94
|
am cca5c3f1: (-s ours) am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit 'cca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa':
|
2015-08-27 11:40:34 +00:00 |
|
Elliott Hughes
|
9ecbf3b8f9
|
am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build."
* commit '32cfa9527136665689818399771174b5e25d32ba':
|
2015-08-27 11:40:25 +00:00 |
|
Elliott Hughes
|
94ee3eab00
|
am 546738a4: (-s ours) am 6657d224: am 069f62de: Merge "Fix N9 boot."
* commit '546738a4e7afbb216876cf65791c87adb0541e7d':
|
2015-08-27 11:40:07 +00:00 |
|
Elliott Hughes
|
c826b5b064
|
am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."
* commit 'cb599d34b94d638d8fca6aee267e006e7d68d663':
|
2015-08-27 11:40:00 +00:00 |
|
Jeff Sharkey
|
1d87302df6
|
am f1e44bb9: (-s ours) am ed2fe57c: Use single tree for multiple storage views.
* commit 'f1e44bb9c60d63c7e05212b85803808c4142d785':
|
2015-08-27 11:39:54 +00:00 |
|
Elliott Hughes
|
e455dff013
|
am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"
* commit '7e71d42701e6ad78d4327db40ef7d34e1e75c1e2':
|
2015-08-27 11:39:49 +00:00 |
|
Elliott Hughes
|
faa14c2eec
|
am e45a6650: (-s ours) am c06c3001: am a1c344b9: Merge "Move mkdirs to adb_utils."
* commit 'e45a665040bfd317d9ed36ecac64a33d951e1fd7':
|
2015-08-27 11:39:37 +00:00 |
|
Nick Kralevich
|
d09d1ff37c
|
am 64be1683: (-s ours) am d9bb7852: am c66e37b2: Merge "init: refuse to start process if domain transition not defined"
* commit '64be1683689b0f0ccac04aab44c3b7d743cd2327':
|
2015-08-27 11:39:31 +00:00 |
|
Sami Tolvanen
|
0405485c79
|
am 5f2b3b4b: (-s ours) am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"
* commit '5f2b3b4be8a769d9eea836a21e6e077cd526d3a0':
|
2015-08-27 11:39:27 +00:00 |
|
Daniel Rosenberg
|
861dfa7917
|
am be92912d: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit 'be92912d1adca8954bc81dbd03e8e1635154957e':
|
2015-08-27 11:39:22 +00:00 |
|
Daniel Rosenberg
|
b94b4f1ad5
|
am 15db3551: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit '15db3551d005a58407a8ac97b73a879530dd3e74':
resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
|
2015-08-27 11:39:18 +00:00 |
|
Daniel Rosenberg
|
b4bb346e4c
|
am 6b6687be: (-s ours) am 00392411: am e7ed68ad: Merge "libcutils: fs_config: Add folders normally created in init.rc"
* commit '6b6687bec97bb325f21fc9bfde8256430b55cc3c':
|
2015-08-27 11:39:14 +00:00 |
|
Daniel Rosenberg
|
b4943598bc
|
am cdf768fe: (-s ours) am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk"
* commit 'cdf768fe7c13f1dfae2bde6fb6d32b8400d56393':
|
2015-08-27 11:39:10 +00:00 |
|
Yin-Chia Yeh
|
b4b83c1cc4
|
am 84cf943a: (-s ours) am 0fdee393: Merge "graphics: update flexible YUV format gralloc requirement" into mnc-dev
* commit '84cf943afb0d3e2817939db31aa7effb1ac4af8d':
|
2015-08-27 11:39:06 +00:00 |
|
Calin Juravle
|
3743258900
|
am 1e76cac9: (-s ours) am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache"
* commit '1e76cac936fd47df26a65929f812277207a47462':
|
2015-08-27 11:39:01 +00:00 |
|
Jim Miller
|
9282b54fa7
|
am b3fa991f: (-s ours) am 1ee9d9a8: Merge "Fingerprint: Add HAL close() code" into mnc-dev
* commit 'b3fa991fecb9db3161023798601c28bc9af70d3e':
|
2015-08-27 11:38:53 +00:00 |
|
Tao Bao
|
941feb6b79
|
am bdc0e13d: (-s ours) am 75b3f8c9: am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible."
* commit 'bdc0e13d2053c36384c102161b7346fd5fb007a3':
|
2015-08-27 11:38:46 +00:00 |
|
Thierry Strudel
|
4fcbe635bf
|
am a0fbb908: (-s ours) am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev
* commit 'a0fbb908855d2476f5dd86c8172177f1c08d1428':
|
2015-08-27 11:38:37 +00:00 |
|
Andres Morales
|
792d3c486a
|
am a9515736: (-s ours) am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
* commit 'a9515736e9c147bfa41235088b3bf2899aa8bd5f':
|
2015-08-27 11:38:26 +00:00 |
|
Andres Morales
|
c1bdcf56c0
|
am c7a8f67e: (-s ours) am 0b0435ea: [gatekeeperd] fix file descriptor leak
* commit 'c7a8f67e425d286a9eba4a9716ea2590b8752f90':
|
2015-08-27 11:38:16 +00:00 |
|
Christopher Ferris
|
9dcbe6b13f
|
am a28c0810: (-s ours) am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable."
* commit 'a28c0810d3ba0664974d533d00a907107eb9be07':
|
2015-08-27 11:37:58 +00:00 |
|
Pirama Arumuga Nainar
|
5806ab6125
|
am 2aee3fd8: (-s ours) am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]"
* commit '2aee3fd843138b22f34dc7249c2a2c13a4a49550':
|
2015-08-27 11:37:48 +00:00 |
|
Dan Albert
|
881f853345
|
am fcbc32de: (-s ours) am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral.""
* commit 'fcbc32de34ceea570824b98f243d40a228df1989':
|
2015-08-27 11:37:29 +00:00 |
|