- c9a7329 am 6c74e545: (-s ours) am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file." by Evgenii Stepanov · 10 years ago
- 06488c9 am d717f86a: (-s ours) am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer" by Nick Kralevich · 10 years ago
- 2722a6d am 92c1a372: (-s ours) am 5abbd967: am 94a845d9: Merge "Lose ionice and renice to toybox." by Elliott Hughes · 10 years ago
- a1a6491 am f3f5bce2: (-s ours) am 6a701bd9: am b53b521e: Merge "Add `adb features`." by David Pursell · 10 years ago
- ba8dd65 am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner." by David Pursell · 10 years ago
- 37d97ea am 2733c142: (-s ours) am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1." by Elliott Hughes · 10 years ago
- aea2068 am 60f9026e: (-s ours) am b4aa1777: am 782daf89: Merge "Fix the Mac libbase build." by Elliott Hughes · 10 years ago
- 15d40c5 am b3d3e245: (-s ours) am ba7284ae: am 4d40c03b: Merge "adb: On Mac, clear both host and device endpoints at startup" by Siva Velusamy · 10 years ago
- f2f683f am bf449983: (-s ours) am e1c3a7c1: am 45288223: Merge "libbase: logging fixes" by Elliott Hughes · 10 years ago
- f36de49 am 1deb0317: (-s ours) am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer"" by Nick Kralevich · 10 years ago
- 7d809a1 am f36aa8ec: (-s ours) am 5563b77a: am 57532b2a: Merge "adb: improve network error info" by Elliott Hughes · 10 years ago
- 0e39a1b am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock" by Elliott Hughes · 10 years ago
- 611e944 am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output" by Elliott Hughes · 10 years ago
- 628b0c7 am 87ea6cfb: (-s ours) am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing" by Riley Andrews · 10 years ago
- a11886b am c1490ad9: (-s ours) am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing" by Riley Andrews · 10 years ago
- f875dec am 6eef56fb: (-s ours) am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells." by David Pursell · 10 years ago
- b3e681f am 63a29199: (-s ours) am 87f73de9: am 317acfb8: Merge "Remove confusing variable HOST." by Yabin Cui · 10 years ago
- 6a813cd am f236bdda: (-s ours) am 450ed3e8: am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files." by Bertrand Simonnet · 10 years ago
- 8e40385 am 83399202: (-s ours) am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2." by Bertrand Simonnet · 10 years ago
- 86d73f2 am 864d4985: (-s ours) am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer" by Nick Kralevich · 10 years ago
- b6693de am efc80772: (-s ours) am c01231b3: am 2fb00423: Merge "Always include the adb version in the log." by Elliott Hughes · 10 years ago
- 83e7dfb am f000f7b2: (-s ours) am 70af6e0b: am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal" by Elliott Hughes · 10 years ago
- d0fd6c6 am 1763d1aa: (-s ours) am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages" by Mark Salyzyn · 10 years ago
- 31cee45 am 9cb4af39: (-s ours) am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled" by Elliott Hughes · 10 years ago
- 013c45f am 97a8cd95: (-s ours) am e78292f2: am cef3508b: Merge "Add missing includes." by Dan Albert · 10 years ago
- 57eaa65 am 5cfda541: (-s ours) am c5482138: am ea56594c: Merge "logd: sizes > 1M prune in smaller batches" by Mark Salyzyn · 10 years ago
- 463f4d3 am e6b72a4e: (-s ours) am 06a9f560: am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation" by Elliott Hughes · 10 years ago
- 90f4df6 am 12e77877: (-s ours) am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()" by Tom Cherry · 10 years ago
- 9bc0fe6 am dd35a305: (-s ours) am 86ec2a88: am 162ec8e6: Merge "Ignore adb/*.pyc files" by Yusuke Sato · 10 years ago
- 5c89899 am acfd2b4b: (-s ours) am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux." by Bertrand Simonnet · 10 years ago
- 4a96f9d am ccb0806b: (-s ours) am 92b100b3: am 3670eab0: Merge "metricsd: Add Android.mk." by Bertrand Simonnet · 10 years ago
- 4bdd5d9 am 87538c8f: (-s ours) am 3cc101d6: am e329a3ec: Merge "Remove watchprops." by Elliott Hughes · 10 years ago
- 4bd8c0d am 6396f64f: (-s ours) am 61ff977b: am 1f36ae49: Merge "adb: win32: write ACK to separate pipe instead of stdout" by Elliott Hughes · 10 years ago
- ee576d7 am d0f0f88e: (-s ours) am b6798ebb: am 5a1f9a3e: Merge "Remove the USB vendor id whitelist from fastboot." by Elliott Hughes · 10 years ago
- b5aedd0 am 532df433: (-s ours) am bd1b5f34: am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain" by Gaurav Shah · 10 years ago
- 9dc6e30 am 9ca8f2fd: (-s ours) am 22f14b0f: am b889d7e4: Merge "crash_reporter: Remove Chrome collector, CrOS build files, DBus" by Gaurav Shah · 10 years ago
- d36c228 am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd." by Gaurav Shah · 10 years ago
- 04160b8 am 8c8c6d65: (-s ours) am 0e8acc3c: am 011b2bc3: Merge "metrics: Add a CLI flag to disable dbus." by Gaurav Shah · 10 years ago
- ea354d6 am 594e128f: (-s ours) am fb44650a: am dc15f4cd: Merge "metrics: Enable for non-official builds." by Gaurav Shah · 10 years ago
- 821f6cb am de0bc2a2: (-s ours) am b949867c: am 855b618f: Merge "crash_reporter: Fix header include paths" by Steve Fung · 10 years ago
- 56c69e9 am c6087a2d: (-s ours) am 7d41a8c8: am 6ada1665: Merge "metrics: Remove send to autotest." by Bertrand Simonnet · 10 years ago
- 8a07768 am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h." by Bertrand Simonnet · 10 years ago
- 7b57010 am 7c269663: (-s ours) am f69a27f8: am 182673ec: Merge "metrics: Cleanup the system profile setter." by Bertrand Simonnet · 10 years ago
- f84888e am 077a839b: (-s ours) am 73e5c768: am 38f55079: Merge "metrics: Disable stat collection." by Bertrand Simonnet · 10 years ago
- 2a91db7 am 225660dd: (-s ours) am 1cdf6e94: am d16e9c25: Merge "metrics: Don\'t use the policy file." by Bertrand Simonnet · 10 years ago
- 0a5a2cf am fa1db654: (-s ours) am a8b959bb: am 932d61d9: Merge "metrics: Fix import paths for headers." by Bertrand Simonnet · 10 years ago
- 472870b am 841066e7: (-s ours) am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes" by Tom Cherry · 10 years ago
- 96be184 am 184585c4: (-s ours) am af60acef: am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK" by Elliott Hughes · 10 years ago
- 7062f9a am 16059f76: (-s ours) am c5cacda5: am 847ec9a8: Merge "More Mac fastboot failure debugging." by Elliott Hughes · 10 years ago
- 3732233 am a4a90243: (-s ours) am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process" by Elliott Hughes · 10 years ago
- 918ef58 am 08fe47e3: (-s ours) am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes" by Elliott Hughes · 10 years ago
- 45c9fd4 am c684c8de: (-s ours) am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev by Andres Morales · 10 years ago
- e2b65aa am fdf14874: (-s ours) resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp by Jeff Sharkey · 10 years ago
- b7525da am 0e3b339b: (-s ours) am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails." by Elliott Hughes · 10 years ago
- 2acbf47 am f87bc344: (-s ours) am 802c6fd0: am ff52e23f: Merge "Stop being silly." by Elliott Hughes · 10 years ago
- 3e59e71 am a25e258d: (-s ours) am b84e1f54: am 50de8224: Merge "Enable perfboot.py to install APKs before measurement." by Yasuhiro Matsuda · 10 years ago
- ff8fa87 am 93e060e1: (-s ours) am 9e2ed7b0: am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py" by Yasuhiro Matsuda · 10 years ago
- 85793a4 am fdb80810: (-s ours) am ee640552: am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C." by Yasuhiro Matsuda · 10 years ago
- e4d97da6 am 056b97d5: (-s ours) am b57438c8: am e4154f46: Merge "perfboot.py: check 2 more event logs by default" by Yusuke Sato · 10 years ago
- c4c7066 am 764b7f56: (-s ours) am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk" by Daniel Rosenberg · 10 years ago
- e37ab0a am b5c4bc38: (-s ours) am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo." by Elliott Hughes · 10 years ago
- 4a093bb am 7ace565f: (-s ours) am 1da90f0c: am feacf20d: Merge "adb: win32: file descriptor reliability improvements" by Elliott Hughes · 10 years ago
- e35b022 am 88f82b66: (-s ours) am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed." by Daniel Rosenberg · 10 years ago
- 4ade18a am 9358ae91: (-s ours) am 69386e33: am 81fd50c3: Merge "perfboot.py: ignore tags not listed in /system/etc/event-log-tags" by Yusuke Sato · 10 years ago
- 8d27ded am fb1dbac1: (-s ours) am eee501ec: am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc" by Elliott Hughes · 10 years ago
- 7f23ec8 am b7c0bfbc: (-s ours) am 14c08745: am 6355f2c1: Merge "adb: win32: call SystemErrorCodeToString() from more places" by Elliott Hughes · 10 years ago
- be0d2ca am e043761c: (-s ours) am c783e1a3: am 0fac7fd1: Merge "Leave the evidence lying around if an adb test fails." by Elliott Hughes · 10 years ago
- e8f16f1 am 48f28797: (-s ours) am 5e34b3ab: am 72488aa0: Merge "perfboot.py: warn if dm-verity is disabled" by Yusuke Sato · 10 years ago
- 3273068 am 8f13dc42: (-s ours) am 6eb9aa62: am 6bf93400: Merge "adb: fix mkdirs / adb pull with relative paths, fix win32 issues" by Elliott Hughes · 10 years ago
- 35b8a87 am bc3c21b9: (-s ours) am c3766916: am 8c61e029: Merge "adb_test/libbase_test: win32: get some tests working" by Elliott Hughes · 10 years ago
- ab0c2e7 am a121a81f: (-s ours) am 07522aae: am bb3b45d2: Merge "libbase_test: win32: get some tests working" by Elliott Hughes · 10 years ago
- 1f2bf42 am b6545bf5: (-s ours) am 0070026c: am 4247ebfd: Merge "init: use std::vector<std::string> for argument passing" by Tom Cherry · 10 years ago
- 1716681 am 94927221: (-s ours) am 1f6204a8: am 6782ca0b: Merge "Add a trace constant for PackageManager" by Todd Kennedy · 10 years ago
- a146676 am 3f0a0142: (-s ours) am d2984900: am 11ca81fc: Merge "Remove adb\'s unused get_my_path for Windows." by Elliott Hughes · 10 years ago
- 26ba4bd am 2df4804a: (-s ours) am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection." by Yabin Cui · 10 years ago
- e5db324 am df01d12e: (-s ours) am 45ca3d54: am a336cbcd: Merge "Reserve new UID range for OEM." by Jorge Lucangeli Obes · 10 years ago
- e444b9b am 66429b34: (-s ours) am b8b71186: am 367fb503: Merge "adb: win32: Unicode path names, env vars, some console support" by Elliott Hughes · 10 years ago
- e490e4d am 23ec3e46: (-s ours) am 2f9e1db3: am b5d6ad81: Merge "Stop calling fsck on shutdown by default" by Yusuke Sato · 10 years ago
- b3769b4 am 7ff4bb7e: (-s ours) am 150c05fe: am 0f918878: Merge "init: Adding header guard to tokenizer" by Lee Campbell · 10 years ago
- 4847baf am 5e6d1dcf: (-s ours) am 3d561748: am ec035950: Merge "Clean up -p handling slightly." by Elliott Hughes · 10 years ago
- 489bfee am c0d738f3: (-s ours) am 6dca1987: am cf4dba5a: Merge "adb: win32: initial IPv6 support and improved Winsock error reporting" by Elliott Hughes · 10 years ago
- e43bff0 am 739349cd: (-s ours) am a6fda917: am dc1fb361: Merge "Make clear of the data length sent by write_packet." by Yabin Cui · 10 years ago
- 68b9b72 am e0b43a17: (-s ours) resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp by Elliott Hughes · 10 years ago
- 041c1be am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp by Elliott Hughes · 10 years ago
- 11b9deb am 97d393bb: (-s ours) am a21d8562: am d548e30f: Merge "init: Create classes for Action and Command" by Tom Cherry · 10 years ago
- ac8591e am 2bcba6de: (-s ours) am 9773d945: am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning" by Andreas Gampe · 10 years ago
- b6c5b39 am 71585213: (-s ours) am 1691d968: am 138c540f: Merge "init: Add C++ tokenizer." by Lee Campbell · 10 years ago
- 257378f am e12db0b2: (-s ours) am bec459a2: am 480bea33: Merge "Add top level sanitize options for ADB." by Dan Albert · 10 years ago
- dbaa05e am cad03b16: (-s ours) am 7a699a6a: am 9bc4e7a5: Merge "bionic no longer sends SIGPIPE to debuggerd." by Elliott Hughes · 10 years ago
- fe668e1 am 6036a4ff: (-s ours) am cc552ea3: am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL" by Dan Albert · 10 years ago
- 6514110 am 145afc2c: (-s ours) am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." by Elliott Hughes · 10 years ago
- 04e1f22 am c6dbc858: (-s ours) am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK." by Elliott Hughes · 10 years ago
- 027167e am 6b802c4b: (-s ours) am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence." by Yasuhiro Matsuda · 10 years ago
- e4dda17 am eeea3fc1: (-s ours) am 1a1f9beb: am dcf89091: Merge "Add a script to record Android boot time." by Yasuhiro Matsuda · 10 years ago
- 104c652 am 841e96f4: (-s ours) am ae7e8d44: am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>." by Elliott Hughes · 10 years ago
- 375e7fa am 2b72d68e: (-s ours) am e0541c7d: am a6597598: Merge "fix adb {forward,reverse} --no-rebind" by Elliott Hughes · 10 years ago
- 1fe0f77 am 92a3d2ba: (-s ours) am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h." by Elliott Hughes · 10 years ago
- 7f0855b am 4c041f55: (-s ours) am da65eee8: am 05b9edc2: Merge "crash_reporter: Add license information." by Bertrand Simonnet · 10 years ago
- 46f6ee1 am 6675db39: (-s ours) am ddbbc6d2: am 75ecc74a: Merge "metrics: Add license information." by Bertrand Simonnet · 10 years ago
- 50ca057 am e0176199: (-s ours) am d57125af: Merge "Give secondary users read-only physical cards." into mnc-dev by Jeff Sharkey · 10 years ago