Elliott Hughes
|
8d02c097c2
|
am a121a81f: (-s ours) am 07522aae: am bb3b45d2: Merge "libbase_test: win32: get some tests working"
* commit 'a121a81f5cb2fb92903731705a9e2fa72968afbd':
|
2015-08-27 11:50:18 +00:00 |
|
Tom Cherry
|
380cc33fb8
|
am b6545bf5: (-s ours) am 0070026c: am 4247ebfd: Merge "init: use std::vector<std::string> for argument passing"
* commit 'b6545bf559d491f17e30af4fc3071489a3ea9755':
|
2015-08-27 11:50:14 +00:00 |
|
Todd Kennedy
|
2aee50f212
|
am 94927221: (-s ours) am 1f6204a8: am 6782ca0b: Merge "Add a trace constant for PackageManager"
* commit '9492722131ccb5280f29c161211399f8d93b8fef':
|
2015-08-27 11:50:11 +00:00 |
|
Elliott Hughes
|
93b575041d
|
am 3f0a0142: (-s ours) am d2984900: am 11ca81fc: Merge "Remove adb\'s unused get_my_path for Windows."
* commit '3f0a0142818a3e540306d70f43e5c87b4e232465':
|
2015-08-27 11:50:07 +00:00 |
|
Yabin Cui
|
8f0daa520d
|
am 2df4804a: (-s ours) am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection."
* commit '2df4804ace526029b622c34e3200e6d71f2f265a':
|
2015-08-27 11:50:04 +00:00 |
|
Jorge Lucangeli Obes
|
23bac12e4b
|
am df01d12e: (-s ours) am 45ca3d54: am a336cbcd: Merge "Reserve new UID range for OEM."
* commit 'df01d12e14a7dc819f05bf0b1c6c137b3c105d5c':
|
2015-08-27 11:50:01 +00:00 |
|
Elliott Hughes
|
adf9165f44
|
am 66429b34: (-s ours) am b8b71186: am 367fb503: Merge "adb: win32: Unicode path names, env vars, some console support"
* commit '66429b34d056b5b638936744a71d49ceb863de94':
|
2015-08-27 11:49:57 +00:00 |
|
Yusuke Sato
|
b1696f6436
|
am 23ec3e46: (-s ours) am 2f9e1db3: am b5d6ad81: Merge "Stop calling fsck on shutdown by default"
* commit '23ec3e468b6111d1f610df6f8eb1340016ce5732':
|
2015-08-27 11:49:54 +00:00 |
|
Lee Campbell
|
8c8f16393b
|
am 7ff4bb7e: (-s ours) am 150c05fe: am 0f918878: Merge "init: Adding header guard to tokenizer"
* commit '7ff4bb7e47e1a64e5171d946c1466c8146b1bb93':
|
2015-08-27 11:49:51 +00:00 |
|
Elliott Hughes
|
9eb6530c80
|
am 5e6d1dcf: (-s ours) am 3d561748: am ec035950: Merge "Clean up -p handling slightly."
* commit '5e6d1dcfac43422a135b1540c4bb245bfe89b294':
|
2015-08-27 11:49:49 +00:00 |
|
Elliott Hughes
|
f552ddc013
|
am c0d738f3: (-s ours) am 6dca1987: am cf4dba5a: Merge "adb: win32: initial IPv6 support and improved Winsock error reporting"
* commit 'c0d738f3314952d7677d74bf97e833aeaa16e553':
|
2015-08-27 11:49:48 +00:00 |
|
Yabin Cui
|
dad02d9eef
|
am 739349cd: (-s ours) am a6fda917: am dc1fb361: Merge "Make clear of the data length sent by write_packet."
* commit '739349cd13735f9d04bf2064a693d34ebd656713':
|
2015-08-27 11:49:46 +00:00 |
|
Elliott Hughes
|
e0dd7955cb
|
am e0b43a17: (-s ours) resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp
* commit 'e0b43a17852081c2fe1c0d2207006e421ffcc74b':
|
2015-08-27 11:49:44 +00:00 |
|
Elliott Hughes
|
5d238ddc15
|
am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp
* commit 'd2117974e4c22ff6b8967c3b5cd2d497a6ffc856':
|
2015-08-27 11:49:42 +00:00 |
|
Tom Cherry
|
9b3b9002de
|
am 97d393bb: (-s ours) am a21d8562: am d548e30f: Merge "init: Create classes for Action and Command"
* commit '97d393bb2d7f2dad83a9e14f9a4aba5a018ef0b8':
|
2015-08-27 11:49:40 +00:00 |
|
Andreas Gampe
|
6f93345b19
|
am 2bcba6de: (-s ours) am 9773d945: am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning"
* commit '2bcba6dede9d0ad42f3192f9163ea33bea4e1bc0':
|
2015-08-27 11:49:38 +00:00 |
|
Lee Campbell
|
4ef88d5eb3
|
am 71585213: (-s ours) am 1691d968: am 138c540f: Merge "init: Add C++ tokenizer."
* commit '7158521377c57579d7c9af0f6de4c3a4d20d94d9':
|
2015-08-27 11:49:35 +00:00 |
|
Dan Albert
|
629fb90a76
|
am e12db0b2: (-s ours) am bec459a2: am 480bea33: Merge "Add top level sanitize options for ADB."
* commit 'e12db0b2011fc0a678f093653342c0d5ecf4272a':
|
2015-08-27 11:49:33 +00:00 |
|
Elliott Hughes
|
aa03dbf15f
|
am cad03b16: (-s ours) am 7a699a6a: am 9bc4e7a5: Merge "bionic no longer sends SIGPIPE to debuggerd."
* commit 'cad03b1637c65e81080b1f389b63591f14a40c53':
|
2015-08-27 11:49:31 +00:00 |
|
Dan Albert
|
cffa893cff
|
am 6036a4ff: (-s ours) am cc552ea3: am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"
* commit '6036a4ff9ae28c095297b70720f39db2e3714b57':
|
2015-08-27 11:49:29 +00:00 |
|
Elliott Hughes
|
0f5146490b
|
am 145afc2c: (-s ours) am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit '145afc2cc4f973a4ad63aeabe5b0f633c8e99cec':
|
2015-08-27 11:49:28 +00:00 |
|
Elliott Hughes
|
000de11a56
|
am c6dbc858: (-s ours) am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit 'c6dbc85845e58464541bb0644ebd570c44841a4c':
|
2015-08-27 11:49:26 +00:00 |
|
Yasuhiro Matsuda
|
6accdcc49e
|
am 6b802c4b: (-s ours) am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
* commit '6b802c4b9565c83a863c88416e6b7e5c3d418aeb':
|
2015-08-27 11:49:24 +00:00 |
|
Yasuhiro Matsuda
|
3e10233e48
|
am eeea3fc1: (-s ours) am 1a1f9beb: am dcf89091: Merge "Add a script to record Android boot time."
* commit 'eeea3fc1be1c482dd04e7736dcf86ed04136be06':
|
2015-08-27 11:49:22 +00:00 |
|
Elliott Hughes
|
53d5831bee
|
am 841e96f4: (-s ours) am ae7e8d44: am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."
* commit '841e96f4d189f1fc7a22815b99e1797b4fd7cec5':
|
2015-08-27 11:49:20 +00:00 |
|
Elliott Hughes
|
5bc37375f4
|
am 2b72d68e: (-s ours) am e0541c7d: am a6597598: Merge "fix adb {forward,reverse} --no-rebind"
* commit '2b72d68eb8e01de304103785f02b1f3859f055cc':
|
2015-08-27 11:49:18 +00:00 |
|
Elliott Hughes
|
ef2fc23769
|
am 92a3d2ba: (-s ours) am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."
* commit '92a3d2ba32cbfcd329630cc1b2e4787bf4496048':
|
2015-08-27 11:49:14 +00:00 |
|
Bertrand Simonnet
|
e3c9a037e7
|
am 4c041f55: (-s ours) am da65eee8: am 05b9edc2: Merge "crash_reporter: Add license information."
* commit '4c041f55a32c8b6835f9e818541ab8bbd0ece929':
|
2015-08-27 11:49:11 +00:00 |
|
Bertrand Simonnet
|
e83393eddb
|
am 6675db39: (-s ours) am ddbbc6d2: am 75ecc74a: Merge "metrics: Add license information."
* commit '6675db397e7fdfc6232d899762f196abf24e94a6':
|
2015-08-27 11:49:06 +00:00 |
|
Jeff Sharkey
|
eb774e2991
|
am e0176199: (-s ours) am d57125af: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit 'e01761998bd37af0d78131d137a79a07d8cdd2ae':
|
2015-08-27 11:49:01 +00:00 |
|
Dan Albert
|
6280d46475
|
am dee79f85: (-s ours) am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests."
* commit 'dee79f85b6c1a359bba1470864dd32a636e5c13b':
|
2015-08-27 11:48:56 +00:00 |
|
Elliott Hughes
|
d025d206fe
|
am b6bfa337: (-s ours) am 07bed194: am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE."
* commit 'b6bfa337e58c0554e6b853ce64eb3fb33a5e16a7':
|
2015-08-27 11:48:49 +00:00 |
|
Elliott Hughes
|
0df0e17763
|
am edb90efc: (-s ours) am 0adda0d5: am 524551fd: Merge "Document the current MAX_USBFS_BULK_SIZE situation."
* commit 'edb90efc1cd0a9ed8c9645ffb3722e70d41a13f4':
|
2015-08-27 11:48:35 +00:00 |
|
Elliott Hughes
|
12a9c9058e
|
am 24419f3c: (-s ours) am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers."
* commit '24419f3c2e5b821e8f3efcfef32c9d530f0bd0d9':
|
2015-08-27 11:48:26 +00:00 |
|
Tao Bao
|
b6e9fb0606
|
am 5c151c4a: (-s ours) am beb13044: am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img."
* commit '5c151c4a4b8c9e6aa0d9dd06eedebc7277963a13':
|
2015-08-27 11:48:13 +00:00 |
|
Jeffrey Vander Stoep
|
2842bdc07c
|
am 6beb774d: (-s ours) am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
* commit '6beb774d5e1606a2a1791c3d165cdecb4fb62b36':
|
2015-08-27 11:48:00 +00:00 |
|
Mark Salyzyn
|
e7057a6e77
|
am 6e629e46: (-s ours) am f2e86153: am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9
* commit '6e629e46a1c284219386df7e97adafbdbd13432e':
|
2015-08-27 11:47:51 +00:00 |
|
Bill Yi
|
a4d8266e19
|
am 49fc21c6: (-s ours) am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics
* commit '49fc21c60e5e791b3fa1794675ba9435ded23e73':
|
2015-08-27 11:47:33 +00:00 |
|
Bill Yi
|
5e223d8f36
|
am d981388e: (-s ours) am db639251: am 5cab5290: Merge branch \'rewrite-crash-reporter\' into merge-crash-reporter
* commit 'd981388e2ba8ddaf572f9d23ae669203b6543e55':
|
2015-08-27 11:47:18 +00:00 |
|
Andreas Gampe
|
394c81c8bd
|
am 18f8bb5f: (-s ours) am 1bc7ac07: am a5b6715c: Merge "Adf: Remove unused variable"
* commit '18f8bb5f19140eb1029e6646b84c9034c12db166':
|
2015-08-27 11:47:10 +00:00 |
|
Elliott Hughes
|
ce21e4c2a3
|
am c6c02ecd: (-s ours) am 4cfbf781: am bb9fcb1e: Merge "Remove gpttool."
* commit 'c6c02ecd2a243ec43b92fde36f2ed1cddafe755b':
|
2015-08-27 11:46:56 +00:00 |
|
Erik Kline
|
6d080d48cd
|
am a7720ca1: (-s ours) am cc451785: Fix incorrectly sized buffer.
* commit 'a7720ca1f905d8fcd76e51ac579d397f899ab4dd':
|
2015-08-27 11:46:48 +00:00 |
|
Lee Campbell
|
cc2b8022cc
|
am 42f669a1: (-s ours) am f75b5ff1: am fe39394e: Merge "init: Adding support to import directories"
* commit '42f669a144e2b92ff7473f802af66cd65dfd2a68':
|
2015-08-27 11:46:35 +00:00 |
|
Dan Albert
|
4681d1fd9e
|
am 0566ab6f: (-s ours) am 05432f07: am 20cf8702: Merge "Create adb Python package."
* commit '0566ab6fed582affad0f6e303f16b3e1ca18e66b':
|
2015-08-27 11:46:29 +00:00 |
|
Andreas Gampe
|
e877069b57
|
am ba6def68: (-s ours) am 0c61a650: am 2e132ef6: Merge "Logd: Handle unused variable and fields"
* commit 'ba6def68054a2e7f61ed803a797dfe47697be435':
|
2015-08-27 11:46:17 +00:00 |
|
Nick Kralevich
|
7599f4c015
|
am 0f42f393: (-s ours) am ba03cc95: am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system"
* commit '0f42f3937126a6de329406216b1bac73da79ef35':
|
2015-08-27 11:46:11 +00:00 |
|
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 |