- 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
- f3b5076 am dee79f85: (-s ours) am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests." by Dan Albert · 10 years ago
- 357de1a am b6bfa337: (-s ours) am 07bed194: am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE." by Elliott Hughes · 10 years ago
- 10b2cbc am edb90efc: (-s ours) am 0adda0d5: am 524551fd: Merge "Document the current MAX_USBFS_BULK_SIZE situation." by Elliott Hughes · 10 years ago
- 4a83daf am 24419f3c: (-s ours) am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers." by Elliott Hughes · 10 years ago
- 7feb7e6 am 5c151c4a: (-s ours) am beb13044: am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img." by Tao Bao · 10 years ago
- b0e35d5 am 6beb774d: (-s ours) am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev by Jeffrey Vander Stoep · 10 years ago
- 279fc24 am 6e629e46: (-s ours) am f2e86153: am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9 by Mark Salyzyn · 10 years ago
- 4a79895 am 49fc21c6: (-s ours) am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics by Bill Yi · 10 years ago
- 3062ee1 am d981388e: (-s ours) am db639251: am 5cab5290: Merge branch \'rewrite-crash-reporter\' into merge-crash-reporter by Bill Yi · 10 years ago
- 4a02112 am 18f8bb5f: (-s ours) am 1bc7ac07: am a5b6715c: Merge "Adf: Remove unused variable" by Andreas Gampe · 10 years ago
- 9bb67f0 am c6c02ecd: (-s ours) am 4cfbf781: am bb9fcb1e: Merge "Remove gpttool." by Elliott Hughes · 10 years ago
- ad5df94 am a7720ca1: (-s ours) am cc451785: Fix incorrectly sized buffer. by Erik Kline · 10 years ago
- 4d0f407 am 42f669a1: (-s ours) am f75b5ff1: am fe39394e: Merge "init: Adding support to import directories" by Lee Campbell · 10 years ago
- 96f5075 am 0566ab6f: (-s ours) am 05432f07: am 20cf8702: Merge "Create adb Python package." by Dan Albert · 10 years ago
- dd53ae5 am ba6def68: (-s ours) am 0c61a650: am 2e132ef6: Merge "Logd: Handle unused variable and fields" by Andreas Gampe · 10 years ago
- 5b886f9 am 0f42f393: (-s ours) am ba03cc95: am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system" by Nick Kralevich · 10 years ago
- 9370dc3 am 8a8953bb: (-s ours) Fix libcutils build. by Elliott Hughes · 10 years ago
- 9d8f983 am 3dced0d2: (-s ours) am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check." by Elliott Hughes · 10 years ago
- 7755b36 am 8b262b9d: (-s ours) resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp by Elliott Hughes · 10 years ago
- b21f473 am a6d23bd6: (-s ours) am 10821da3: am 8a502000: Merge "init: expand_props for onrestart commands." by Yabin Cui · 10 years ago
- 69afefd am 57eb040b: (-s ours) am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins." by Yabin Cui · 10 years ago
- cf8e0ab am 5bd3c3bb: (-s ours) am b8fa711f: am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb." by Elliott Hughes · 10 years ago
- 93026e8 am c200e956: (-s ours) am 3f62a020: logd: allow logd to write to /dev/cpuset files by Jeff Vander Stoep · 10 years ago
- 379b691 am 187afaf5: (-s ours) am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)." by Elliott Hughes · 10 years ago
- 7f65c90 am 994e9ea7: (-s ours) am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp." by Elliott Hughes · 10 years ago
- 8965fb4 am 4bc35f3e: (-s ours) am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build." by Elliott Hughes · 10 years ago
- fc3c4ac am 62b3f91d: (-s ours) am bff40697: am addf7a96: Merge "init: Let property_get return std::string." by Yabin Cui · 10 years ago
- f4faf61 am 5937a860: (-s ours) am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly." by Elliott Hughes · 10 years ago
- 1d40d49 am b877d72a: (-s ours) am f5defe75: am 89cc750e: Merge "Don\'t limit Windows USB reads." by Elliott Hughes · 10 years ago
- e949226 am d704ede3: (-s ours) am 2fc8a91e: am 6b40d0aa: Merge "adb: win32: fix exec-in and exec-out to use binary mode" by Elliott Hughes · 10 years ago
- db9197c am ae18667f: (-s ours) am d804c6cd: am 571c8d71: Merge "Increase size of the the adb packets sent over the wire" by Elliott Hughes · 10 years ago
- a075012 am dd7fb9af: (-s ours) am 7f12fa27: am f5b46079: Merge "init: use init\'s property expansion code for mount_all" by Elliott Hughes · 10 years ago
- 45857bb am 736c238b: (-s ours) am deee35d7: am 3f1d7ebb: Merge "logd: refine is_prio" by Mark Salyzyn · 10 years ago
- ae0187c am bd83f19f: (-s ours) am 32b4d786: am a5d0ca4f: Merge "Show "(reverse)" in "adb reverse --list"." by Elliott Hughes · 10 years ago
- 690b555 am 3542f3da: (-s ours) am 7b0bb824: am 93adb524: Merge "init: Fix logging stutter" by Mark Salyzyn · 10 years ago
- c732ecb am f6aaed80: (-s ours) am 18fc744f: am 6743dab5: Merge "init: Add additional logging levels" by Mark Salyzyn · 10 years ago
- 830cfcc am fee06481: (-s ours) am d66e949b: am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument." by Elliott Hughes · 10 years ago
- 29face8 am c83614a8: (-s ours) am 59ae3947: am 3bcdaa28: Merge "Recognize IPv6 addresses for "adb connect"." by Elliott Hughes · 10 years ago
- 77c7fc5 am cc07811e: (-s ours) am 3cd33a72: am 5208d551: Merge "adb: logging: newlines, thread ids, error code overwriting" by Elliott Hughes · 10 years ago
- 06d1812 am 7c842b57: (-s ours) am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot" by Yusuke Sato · 10 years ago
- 09da526 am ac6a325e: (-s ours) am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST." by Elliott Hughes · 10 years ago
- 5e9ef2a am d2bb8134: (-s ours) am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk" by Daniel Rosenberg · 10 years ago
- 6c216bd am 0f9b94e2: (-s ours) am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message." by Elliott Hughes · 10 years ago
- e7f685d am cca5c3f1: (-s ours) am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon." by Daniel Erat · 10 years ago
- fc2bd65 am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build." by Elliott Hughes · 10 years ago
- d4c2908 am 546738a4: (-s ours) am 6657d224: am 069f62de: Merge "Fix N9 boot." by Elliott Hughes · 10 years ago
- bc78eb9 am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo." by Elliott Hughes · 10 years ago
- c01101e am f1e44bb9: (-s ours) am ed2fe57c: Use single tree for multiple storage views. by Jeff Sharkey · 10 years ago
- 1351466 am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator" by Elliott Hughes · 10 years ago