Elliott Hughes
|
953e1b662f
|
am ce21e4c2: am c6c02ecd: (-s ours) am 4cfbf781: am bb9fcb1e: Merge "Remove gpttool."
* commit 'ce21e4c2a3e863f3401012a7f450d30311e56e62':
|
2015-08-27 14:29:31 +00:00 |
|
Erik Kline
|
2991643bd8
|
am 6d080d48: am a7720ca1: (-s ours) am cc451785: Fix incorrectly sized buffer.
* commit '6d080d48cd9e7e97e8da2eee9c8abc3747289873':
|
2015-08-27 14:29:26 +00:00 |
|
Lee Campbell
|
3053a4fa3c
|
am cc2b8022: am 42f669a1: (-s ours) am f75b5ff1: am fe39394e: Merge "init: Adding support to import directories"
* commit 'cc2b8022ccb7d501c7317fc37e251b9f81e39cfc':
|
2015-08-27 14:29:22 +00:00 |
|
Dan Albert
|
cefef4e11d
|
am 4681d1fd: am 0566ab6f: (-s ours) am 05432f07: am 20cf8702: Merge "Create adb Python package."
* commit '4681d1fd9eecf64be957840d50832b6441e52c14':
|
2015-08-27 14:29:13 +00:00 |
|
Andreas Gampe
|
6b2f55c325
|
am e877069b: am ba6def68: (-s ours) am 0c61a650: am 2e132ef6: Merge "Logd: Handle unused variable and fields"
* commit 'e877069b576e652d21fdb946452c20742db17980':
|
2015-08-27 14:29:09 +00:00 |
|
Nick Kralevich
|
92fa3d82b7
|
am 7599f4c0: am 0f42f393: (-s ours) am ba03cc95: am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system"
* commit '7599f4c0158f1e0e6c4b969679d5dd441a88307d':
|
2015-08-27 14:29:05 +00:00 |
|
Elliott Hughes
|
283290b0fd
|
am 9d33b777: am 8a8953bb: (-s ours) Fix libcutils build.
* commit '9d33b7773f665ff20f43c13f00688efcd496ba94':
Fix libcutils build.
|
2015-08-27 14:29:02 +00:00 |
|
Elliott Hughes
|
81ef764b3b
|
am 51e69ca1: am 3dced0d2: (-s ours) am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check."
* commit '51e69ca12461433912b295d6a3fc09361369489b':
|
2015-08-27 14:28:59 +00:00 |
|
Elliott Hughes
|
47ae593589
|
am d2d83da4: am 8b262b9d: (-s ours) resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp
* commit 'd2d83da4e4a6fa1555e6385ec6ebc6f6b1e0d21c':
|
2015-08-27 14:28:57 +00:00 |
|
Yabin Cui
|
e8b0975faf
|
am 92e245e8: am a6d23bd6: (-s ours) am 10821da3: am 8a502000: Merge "init: expand_props for onrestart commands."
* commit '92e245e8f652c7d733641355363ade7f8e9f17a5':
|
2015-08-27 14:28:55 +00:00 |
|
Yabin Cui
|
a2fb3f7cac
|
am 0a963c84: am 57eb040b: (-s ours) am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins."
* commit '0a963c848635c5b569997ca3c638cf3f070de2c2':
|
2015-08-27 14:28:53 +00:00 |
|
Elliott Hughes
|
f4558e4633
|
am 21d1aa10: am 5bd3c3bb: (-s ours) am b8fa711f: am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."
* commit '21d1aa106120eae5a83ddafdf423eff1dbf915b7':
|
2015-08-27 14:28:50 +00:00 |
|
Jeff Vander Stoep
|
9c3424044f
|
am 941c6e78: am c200e956: (-s ours) am 3f62a020: logd: allow logd to write to /dev/cpuset files
* commit '941c6e78f589ed5a741e6f80c55c9980ebd78826':
|
2015-08-27 14:28:48 +00:00 |
|
Elliott Hughes
|
bb26b72a58
|
am d0c94f5b: am 187afaf5: (-s ours) am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit 'd0c94f5bab1fcda272aa8267c00b503922ce3700':
|
2015-08-27 14:28:46 +00:00 |
|
Elliott Hughes
|
d8b018104b
|
am c14a92c1: am 994e9ea7: (-s ours) am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit 'c14a92c1fc6c6fd6920b16426d8fb340d02ed214':
|
2015-08-27 14:28:43 +00:00 |
|
Elliott Hughes
|
b3210320fa
|
am 674641eb: am 4bc35f3e: (-s ours) am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build."
* commit '674641eba44e471172c35a46460c6334bac50069':
|
2015-08-27 14:28:40 +00:00 |
|
Yabin Cui
|
9164a43e30
|
am 5f1b750d: am 62b3f91d: (-s ours) am bff40697: am addf7a96: Merge "init: Let property_get return std::string."
* commit '5f1b750de92cd8d8436a0a0664e2b02d53000102':
|
2015-08-27 14:28:38 +00:00 |
|
Elliott Hughes
|
1bdd078ab8
|
am fa6cfef5: am 5937a860: (-s ours) am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly."
* commit 'fa6cfef507ce7604737ec397cae06697185479dd':
|
2015-08-27 14:28:36 +00:00 |
|
Elliott Hughes
|
f31978d219
|
am ebac99cf: am b877d72a: (-s ours) am f5defe75: am 89cc750e: Merge "Don\'t limit Windows USB reads."
* commit 'ebac99cfc10b9ce4c1ad7cacc337aa637adc064d':
|
2015-08-27 14:28:32 +00:00 |
|
Elliott Hughes
|
f0533cdec1
|
am 86598d13: am d704ede3: (-s ours) am 2fc8a91e: am 6b40d0aa: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
* commit '86598d1380e86eb9d86dccc663931ca6edadc57f':
|
2015-08-27 14:28:29 +00:00 |
|
Elliott Hughes
|
95a49aaa8b
|
am 431ef0a7: am ae18667f: (-s ours) am d804c6cd: am 571c8d71: Merge "Increase size of the the adb packets sent over the wire"
* commit '431ef0a73c098fe8586dade68b30a64e0a437fe3':
|
2015-08-27 14:28:27 +00:00 |
|
Elliott Hughes
|
1bbcb26daa
|
am 16ec2e66: am dd7fb9af: (-s ours) am 7f12fa27: am f5b46079: Merge "init: use init\'s property expansion code for mount_all"
* commit '16ec2e661318175cb73fe0f365dd5eb53dd6ad82':
|
2015-08-27 14:28:26 +00:00 |
|
Mark Salyzyn
|
edbfda2872
|
am 96a9ae4c: am 736c238b: (-s ours) am deee35d7: am 3f1d7ebb: Merge "logd: refine is_prio"
* commit '96a9ae4c5e506d91700f236a3339d48a63c89305':
|
2015-08-27 14:28:23 +00:00 |
|
Elliott Hughes
|
6f070cef6a
|
am ef11e8f9: am bd83f19f: (-s ours) am 32b4d786: am a5d0ca4f: Merge "Show "(reverse)" in "adb reverse --list"."
* commit 'ef11e8f91e6739a50171c181f55f8ad4dd7c8228':
|
2015-08-27 14:28:20 +00:00 |
|
Mark Salyzyn
|
50934e1d41
|
am 0381c926: am 3542f3da: (-s ours) am 7b0bb824: am 93adb524: Merge "init: Fix logging stutter"
* commit '0381c9264e1fce0061ff572874ef071179ac3b64':
|
2015-08-27 14:28:16 +00:00 |
|
Mark Salyzyn
|
0ccad126e4
|
am d9306b5d: am f6aaed80: (-s ours) am 18fc744f: am 6743dab5: Merge "init: Add additional logging levels"
* commit 'd9306b5de259230d7f7d5a137d24275660dddf3d':
|
2015-08-27 14:28:12 +00:00 |
|
Elliott Hughes
|
c98004ecb1
|
am 2ae7d6c1: am fee06481: (-s ours) am d66e949b: am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument."
* commit '2ae7d6c16c65d17ea2563275b24d034d6616e5e5':
|
2015-08-27 14:28:08 +00:00 |
|
Elliott Hughes
|
36f4edb9a7
|
am 26738537: am c83614a8: (-s ours) am 59ae3947: am 3bcdaa28: Merge "Recognize IPv6 addresses for "adb connect"."
* commit '267385378e077bbd75d8237727ae0d2ec0208f80':
|
2015-08-27 14:28:02 +00:00 |
|
Elliott Hughes
|
d87449f12c
|
am 8a8ae43b: am cc07811e: (-s ours) am 3cd33a72: am 5208d551: Merge "adb: logging: newlines, thread ids, error code overwriting"
* commit '8a8ae43b08b6a9ec0fb9307dc6f2995f7efb9017':
|
2015-08-27 14:27:55 +00:00 |
|
Yusuke Sato
|
52882da1c8
|
am ed39479f: am 7c842b57: (-s ours) am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot"
* commit 'ed39479f0c5523aa948d5d68df3fb01a1919b88b':
|
2015-08-27 14:27:40 +00:00 |
|
Elliott Hughes
|
c33cdef494
|
am c8e195d6: am ac6a325e: (-s ours) am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST."
* commit 'c8e195d6729cab43bb5996698f7cf317f5aaf155':
|
2015-08-27 14:27:30 +00:00 |
|
Daniel Rosenberg
|
da328c7eb8
|
am 57b3c851: am d2bb8134: (-s ours) am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk"
* commit '57b3c8513406ca3486638c98b951d93b41b233df':
|
2015-08-27 14:27:20 +00:00 |
|
Elliott Hughes
|
889637430b
|
am 68b452b9: am 0f9b94e2: (-s ours) am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."
* commit '68b452b9ef38f7c0fb4c15d1b4efefa43d56d57a':
|
2015-08-27 14:27:04 +00:00 |
|
Daniel Erat
|
3743dc0ce5
|
am 430e86ca: am cca5c3f1: (-s ours) am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit '430e86ca945d42754c87a73e93af04fdc9767fc6':
|
2015-08-27 14:26:54 +00:00 |
|
Elliott Hughes
|
a8ccd020d9
|
am 9ecbf3b8: am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build."
* commit '9ecbf3b8f96de540a1bbbcae7d511411f48fef40':
|
2015-08-27 14:26:35 +00:00 |
|
Elliott Hughes
|
863e9cdb86
|
am 94ee3eab: am 546738a4: (-s ours) am 6657d224: am 069f62de: Merge "Fix N9 boot."
* commit '94ee3eab007e30169c7bd999253f091d0fb3fc1e':
|
2015-08-27 14:26:21 +00:00 |
|
Elliott Hughes
|
a65ec5288c
|
am c826b5b0: am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."
* commit 'c826b5b0643df03ae3607fcb0954869bf09466a7':
|
2015-08-27 14:26:08 +00:00 |
|
Jeff Sharkey
|
9637984b04
|
am 1d87302d: am f1e44bb9: (-s ours) am ed2fe57c: Use single tree for multiple storage views.
* commit '1d87302df6c4a13b8a35e50ebdada19e5b8ba521':
|
2015-08-27 14:25:48 +00:00 |
|
Elliott Hughes
|
a49732b757
|
am e455dff0: am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"
* commit 'e455dff013360eb266ac6ecc0a63a5871722f27a':
|
2015-08-27 14:25:27 +00:00 |
|
Elliott Hughes
|
bfa03aff9d
|
am faa14c2e: am e45a6650: (-s ours) am c06c3001: am a1c344b9: Merge "Move mkdirs to adb_utils."
* commit 'faa14c2eec070aeb4d7839793b47231b9afeeac1':
|
2015-08-27 14:25:08 +00:00 |
|
Nick Kralevich
|
63af7a6bba
|
am d09d1ff3: am 64be1683: (-s ours) am d9bb7852: am c66e37b2: Merge "init: refuse to start process if domain transition not defined"
* commit 'd09d1ff37c60aab5e5ff46b23f3fd93777b9da72':
|
2015-08-27 14:24:55 +00:00 |
|
Sami Tolvanen
|
ed58676f26
|
am 0405485c: am 5f2b3b4b: (-s ours) am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"
* commit '0405485c79037eef64efb4ab2d86c2ce71ff88e5':
|
2015-08-27 14:24:37 +00:00 |
|
Daniel Rosenberg
|
447b80609b
|
am 861dfa79: am be92912d: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit '861dfa7917a79f8bffbb35a51f52a43b59b836bf':
|
2015-08-27 14:24:28 +00:00 |
|
Daniel Rosenberg
|
2bfbd82a94
|
am b94b4f1a: am 15db3551: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit 'b94b4f1ad502824f9da8e002055e32992d0f3fa4':
resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
|
2015-08-27 14:24:12 +00:00 |
|
Daniel Rosenberg
|
8c2e86ef1d
|
am b4bb346e: am 6b6687be: (-s ours) am 00392411: am e7ed68ad: Merge "libcutils: fs_config: Add folders normally created in init.rc"
* commit 'b4bb346e4cddddc80ec654571776f699742065c8':
|
2015-08-27 14:24:05 +00:00 |
|
Daniel Rosenberg
|
8fa4db3d87
|
am b4943598: am cdf768fe: (-s ours) am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk"
* commit 'b4943598bc91100fe4eef76e658adb6ce1e87f04':
|
2015-08-27 14:23:59 +00:00 |
|
Yin-Chia Yeh
|
ae0925cc12
|
am b4b83c1c: am 84cf943a: (-s ours) am 0fdee393: Merge "graphics: update flexible YUV format gralloc requirement" into mnc-dev
* commit 'b4b83c1cc485d4c9a2e0e7937c5ca179665cae12':
|
2015-08-27 14:23:54 +00:00 |
|
Calin Juravle
|
1175f78eab
|
am 37432589: am 1e76cac9: (-s ours) am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache"
* commit '3743258900e157562d62022ed05fc08d35672125':
|
2015-08-27 14:23:48 +00:00 |
|
Jim Miller
|
79d571cccb
|
am 9282b54f: am b3fa991f: (-s ours) am 1ee9d9a8: Merge "Fingerprint: Add HAL close() code" into mnc-dev
* commit '9282b54fa7f797b1313b2bc6e3e991dead07b8d0':
|
2015-08-27 14:23:40 +00:00 |
|
Tao Bao
|
7800786263
|
am 941feb6b: am bdc0e13d: (-s ours) am 75b3f8c9: am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible."
* commit '941feb6b79b05bf5c6d91a45031eba81edfaee11':
|
2015-08-27 14:23:27 +00:00 |
|