Elliott Hughes
|
6c5e3e02f0
|
am f552ddc0: am c0d738f3: (-s ours) am 6dca1987: am cf4dba5a: Merge "adb: win32: initial IPv6 support and improved Winsock error reporting"
* commit 'f552ddc01319d507c0cafafe0fb015ae85c07f27':
|
2015-08-27 14:31:06 +00:00 |
|
Yabin Cui
|
87ffce745f
|
am dad02d9e: am 739349cd: (-s ours) am a6fda917: am dc1fb361: Merge "Make clear of the data length sent by write_packet."
* commit 'dad02d9eef7ec5ef4a317f8820ea5bbb2157d058':
|
2015-08-27 14:31:03 +00:00 |
|
Elliott Hughes
|
c296d3c547
|
am e0dd7955: am e0b43a17: (-s ours) resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp
* commit 'e0dd7955cb47b012bc1225a55d268019f4b3482b':
|
2015-08-27 14:31:01 +00:00 |
|
Elliott Hughes
|
83915b58e8
|
am 5d238ddc: am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp
* commit '5d238ddc156ae061a8b69fa9c4141e76ae5d07b2':
|
2015-08-27 14:30:59 +00:00 |
|
Tom Cherry
|
eec81d4e2e
|
am 9b3b9002: am 97d393bb: (-s ours) am a21d8562: am d548e30f: Merge "init: Create classes for Action and Command"
* commit '9b3b9002de420ea13ac30ca2d4e9bc11a37be85d':
|
2015-08-27 14:30:57 +00:00 |
|
Andreas Gampe
|
3acfe0b6cd
|
am 6f93345b: am 2bcba6de: (-s ours) am 9773d945: am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning"
* commit '6f93345b199a3e4bedd31778102751d4dc923f49':
|
2015-08-27 14:30:56 +00:00 |
|
Lee Campbell
|
2b86b3516a
|
am 4ef88d5e: am 71585213: (-s ours) am 1691d968: am 138c540f: Merge "init: Add C++ tokenizer."
* commit '4ef88d5eb3065663db89962e6b4dbd8ea9a4d8b3':
|
2015-08-27 14:30:54 +00:00 |
|
Dan Albert
|
ffbf997739
|
am 629fb90a: am e12db0b2: (-s ours) am bec459a2: am 480bea33: Merge "Add top level sanitize options for ADB."
* commit '629fb90a76089c81711b0ff7737ba18168f29890':
|
2015-08-27 14:30:52 +00:00 |
|
Elliott Hughes
|
515e51015e
|
am aa03dbf1: am cad03b16: (-s ours) am 7a699a6a: am 9bc4e7a5: Merge "bionic no longer sends SIGPIPE to debuggerd."
* commit 'aa03dbf15f2151b76e9c1a3356d1963cdfae8002':
|
2015-08-27 14:30:51 +00:00 |
|
Dan Albert
|
e6a8a0ebdc
|
am cffa893c: am 6036a4ff: (-s ours) am cc552ea3: am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"
* commit 'cffa893cff2bc2d5a14012b819b4080f8160b83c':
|
2015-08-27 14:30:49 +00:00 |
|
Elliott Hughes
|
2dc034d410
|
am 0f514649: am 145afc2c: (-s ours) am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit '0f5146490b1c9d07297753dff26780e812db3f20':
|
2015-08-27 14:30:48 +00:00 |
|
Elliott Hughes
|
b65c0f3ed0
|
am 000de11a: am c6dbc858: (-s ours) am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '000de11a5669fc444897955ebe287914fbaba405':
|
2015-08-27 14:30:46 +00:00 |
|
Yasuhiro Matsuda
|
6b62a92472
|
am 6accdcc4: am 6b802c4b: (-s ours) am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
* commit '6accdcc49e6ea928a86182e76caa68a84b9bd77d':
|
2015-08-27 14:30:45 +00:00 |
|
Yasuhiro Matsuda
|
63970570ae
|
am 3e10233e: am eeea3fc1: (-s ours) am 1a1f9beb: am dcf89091: Merge "Add a script to record Android boot time."
* commit '3e10233e4884f79065850cd5902a63eb3d2e3a0f':
|
2015-08-27 14:30:43 +00:00 |
|
Elliott Hughes
|
7af57f3ba7
|
am 53d5831b: am 841e96f4: (-s ours) am ae7e8d44: am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."
* commit '53d5831bee1eeb6aabe78ff63e9ed38fd86fb88a':
|
2015-08-27 14:30:41 +00:00 |
|
Elliott Hughes
|
1e6d1c28f3
|
am 5bc37375: am 2b72d68e: (-s ours) am e0541c7d: am a6597598: Merge "fix adb {forward,reverse} --no-rebind"
* commit '5bc37375f4d1f8c9ecd19bfb611c7fa217d532ec':
|
2015-08-27 14:30:39 +00:00 |
|
Elliott Hughes
|
834d41bae6
|
am ef2fc237: am 92a3d2ba: (-s ours) am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."
* commit 'ef2fc237691128011d00a3ee415552ec2f031c7c':
|
2015-08-27 14:30:37 +00:00 |
|
Bertrand Simonnet
|
9b755951d4
|
am e3c9a037: am 4c041f55: (-s ours) am da65eee8: am 05b9edc2: Merge "crash_reporter: Add license information."
* commit 'e3c9a037e7e039a4ce47dfa8df283f6abe9d80d8':
|
2015-08-27 14:30:35 +00:00 |
|
Bertrand Simonnet
|
2b3e7612c7
|
am e83393ed: am 6675db39: (-s ours) am ddbbc6d2: am 75ecc74a: Merge "metrics: Add license information."
* commit 'e83393eddb24d379ff90cf1a36a27a9bd0b77da3':
|
2015-08-27 14:30:32 +00:00 |
|
Jeff Sharkey
|
dd370791e6
|
am eb774e29: am e0176199: (-s ours) am d57125af: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit 'eb774e29911dcbddeebc0d4a45d8c118473b6cbb':
|
2015-08-27 14:30:29 +00:00 |
|
Dan Albert
|
22d26e8ca1
|
am 6280d464: am dee79f85: (-s ours) am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests."
* commit '6280d46475d83e530c772d648c848452e05615a7':
|
2015-08-27 14:30:26 +00:00 |
|
Elliott Hughes
|
4375a62c1f
|
am d025d206: am b6bfa337: (-s ours) am 07bed194: am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE."
* commit 'd025d206fe70735e5da81f25647dc0771a870f3b':
|
2015-08-27 14:30:22 +00:00 |
|
Elliott Hughes
|
e0d45b1fa5
|
am 0df0e177: am edb90efc: (-s ours) am 0adda0d5: am 524551fd: Merge "Document the current MAX_USBFS_BULK_SIZE situation."
* commit '0df0e1776322dc94bbc4ea9523b5c6ec1a7d662d':
|
2015-08-27 14:30:18 +00:00 |
|
Elliott Hughes
|
ba7729a57f
|
am 12a9c905: am 24419f3c: (-s ours) am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers."
* commit '12a9c9058e85a32b8676999f910201aed50707e4':
|
2015-08-27 14:30:14 +00:00 |
|
Tao Bao
|
65272ada73
|
am b6e9fb06: am 5c151c4a: (-s ours) am beb13044: am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img."
* commit 'b6e9fb0606e0b850cb8763848caab2bc8c426229':
|
2015-08-27 14:30:10 +00:00 |
|
Jeffrey Vander Stoep
|
b199a4b9ce
|
am 2842bdc0: am 6beb774d: (-s ours) am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
* commit '2842bdc07cac9351c4cebc1b361894479545ad99':
|
2015-08-27 14:30:06 +00:00 |
|
Mark Salyzyn
|
05f14068cd
|
am e7057a6e: am 6e629e46: (-s ours) am f2e86153: am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9
* commit 'e7057a6e77b97c1a301cf77a4ea66d2054c76b41':
|
2015-08-27 14:30:01 +00:00 |
|
Bill Yi
|
e6c9ddf516
|
am a4d8266e: am 49fc21c6: (-s ours) am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics
* commit 'a4d8266e1963dfeec3298831857202422ae713f4':
|
2015-08-27 14:29:56 +00:00 |
|
Bill Yi
|
4a6cec0e8c
|
am 5e223d8f: am d981388e: (-s ours) am db639251: am 5cab5290: Merge branch \'rewrite-crash-reporter\' into merge-crash-reporter
* commit '5e223d8f36ec2df1d13e0f5c9b67fd63cdc9d432':
|
2015-08-27 14:29:42 +00:00 |
|
Andreas Gampe
|
cd37b11d0e
|
am 394c81c8: am 18f8bb5f: (-s ours) am 1bc7ac07: am a5b6715c: Merge "Adf: Remove unused variable"
* commit '394c81c8bd608784f6c6d0236debb2e33c5b5711':
|
2015-08-27 14:29:36 +00:00 |
|
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 |
|