- 9244666 am f1d48975: am 7f3e8b65: (-s ours) am 916a5c86: am 0f6c07b7: Merge "crash_reporter: Add Android.mk" by Steve Fung · 10 years ago
- 5686e5a am 04be8136: am 30baa479: (-s ours) Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dev-plus-aosp by Elliott Hughes · 10 years ago
- 709abf5 am 4dda1858: am 57a082f4: (-s ours) resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp by Tom Cherry · 10 years ago
- 4dafcfb am ef1c79ae: am d64bf338: (-s ours) am 08a6775f: am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all" by Tom Cherry · 10 years ago
- 070e963 am f3c12f4d: am 60eb73ed: (-s ours) am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\' by Tom Cherry · 10 years ago
- 10bef7e am ff7230a7: am 1695b846: (-s ours) am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string" by Mark Salyzyn · 10 years ago
- 2f52b93 am d9d21cb7: am d52484c7: (-s ours) am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string" by Mark Salyzyn · 10 years ago
- 123a985 am 7b44fd5e: am 36a590ab: (-s ours) am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string" by Mark Salyzyn · 10 years ago
- 67fd146 am 6a6bcc2a: am 8b9da2d4: (-s ours) am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions" by Steve Fung · 10 years ago
- 95a7a0a am b4d2e89d: am 14dbb332: (-s ours) am 64f4adba: am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer" by Mark Salyzyn · 10 years ago
- 8be0631 am 98c17f96: am 64e2d8c0: (-s ours) am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b by Abhishek Arya · 10 years ago
- 4bce5e0 am 9f6eb210: am d1af6018: (-s ours) am 3fa8b550: am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 by Sergio Giro · 10 years ago
- 48f677b am f8c887ff: am 8ec0ba64: (-s ours) am 0ee72c10: am 711e776c: Merge "Display the map offset for each frame." by Christopher Ferris · 10 years ago
- c8c73cd am 8e6187cd: am 2d651eda: (-s ours) am e0ab2322: Display the map offset for each frame. by Christopher Ferris · 10 years ago
- 51d30bf am 89b12ce7: am d227679b: (-s ours) am 6b8fd10a: am 300b1a6b: Merge "metricsd: Don\'t crash when some metadata is missing." by Bertrand Simonnet · 10 years ago
- 2b5f5bd am c2ba04b9: am 60413943: (-s ours) am 2888eec0: am 565d20ef: Merge "metricsd: Enable https by default." by Bertrand Simonnet · 10 years ago
- 25d027b am 4dfd9c16: am 982bbea0: (-s ours) am 2a04ec35: am 07ee12aa: Merge "logd: worst uid record watermark" by Mark Salyzyn · 10 years ago
- 8545a8e am e8d44c50: am 76cbf5f3: (-s ours) am 44a7da74: am 2c1b8f9e: Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4 by Mark Salyzyn · 10 years ago
- 1963cc3 am fc9b1bb7: am 425702fa: (-s ours) am 89b26e28: am e03d0322: Merge "fastboot should say which device it\'s waiting for." by Elliott Hughes · 10 years ago
- 054fa7c am 6a90d9b3: am 338c8669: (-s ours) am 2a2c2036: am e728eb91: Merge "Get fastboot working on OS X" by Elliott Hughes · 10 years ago
- 88e3a57 am 28a49acd: am f10e1ed1: (-s ours) am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." by Daniel Erat · 10 years ago
- fce0656 am 05b22083: am 61c677c8: (-s ours) am cbc6b915: am d4555689: Merge "crash_reporter: Enable core dumps" by Steve Fung · 10 years ago
- e1cc102 am 78107c55: am 6905b112: (-s ours) am cb1e29a9: am 0172dea6: Merge "metrics: Add init script for metrics_daemon." by Bertrand Simonnet · 10 years ago
- 3488a8c am aee7db81: am 2ef82cff: (-s ours) am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext" by Yusuke Sato · 10 years ago
- 8d68dd9 am ac3836b5: am 22b510ad: (-s ours) am 2b0deb91: am a169f3b4: Merge "adb: win32: fix unittest exit code parsing" by Elliott Hughes · 10 years ago
- f840ff7 am ef98e58e: am 6cec026e: (-s ours) am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed." by Elliott Hughes · 10 years ago
- 451adc5 am 855c0fb0: am 4d8c1d22: (-s ours) am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8" by Sergio Giro · 10 years ago
- 1aa89a4 am 3730f8be: am ba71601a: (-s ours) am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev by Sergio Giro · 10 years ago
- 07726ce am 9ca83e34: am 8e9a1ae5: (-s ours) am 885400fd: am 4d09db9d: Merge "perfboot.py: Add --end-tag option" by Yusuke Sato · 10 years ago
- 3200e4f am 39411ec9: am eec5baa0: (-s ours) am 77b9868a: am 6d814037: Merge "libutils: fix signed/unsigned comparison warnings" by Nick Kralevich · 10 years ago
- 1d1421b am 73d7e780: am 8528d9cf: (-s ours) am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core." by Elliott Hughes · 10 years ago
- b5df054 am 54d5e920: am 6c74e545: (-s ours) am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file." by Evgenii Stepanov · 10 years ago
- 979d4e1 am df12dfbb: am d717f86a: (-s ours) am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer" by Nick Kralevich · 10 years ago
- c26e2df am 16e493e2: am 92c1a372: (-s ours) am 5abbd967: am 94a845d9: Merge "Lose ionice and renice to toybox." by Elliott Hughes · 10 years ago
- a5d10c0 am d51ffa04: am f3f5bce2: (-s ours) am 6a701bd9: am b53b521e: Merge "Add `adb features`." by David Pursell · 10 years ago
- 4e6d3fc am 8056ed53: am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner." by David Pursell · 10 years ago
- 443cd0a am b97fded2: am 2733c142: (-s ours) am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1." by Elliott Hughes · 10 years ago
- e8b5e87 am bd363c41: am 60f9026e: (-s ours) am b4aa1777: am 782daf89: Merge "Fix the Mac libbase build." by Elliott Hughes · 10 years ago
- 99ef7dd am 4b3dce46: 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
- baf579b am 1374c48b: am bf449983: (-s ours) am e1c3a7c1: am 45288223: Merge "libbase: logging fixes" by Elliott Hughes · 10 years ago
- bae9d41 am 3066591a: am 1deb0317: (-s ours) am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer"" by Nick Kralevich · 10 years ago
- c0eae38 am bb640d5f: am f36aa8ec: (-s ours) am 5563b77a: am 57532b2a: Merge "adb: improve network error info" by Elliott Hughes · 10 years ago
- 5aa4e92 am 4ef77728: am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock" by Elliott Hughes · 10 years ago
- 8736e50 am 840a4fe0: am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output" by Elliott Hughes · 10 years ago
- 9182c16 am 444f21d4: am 87ea6cfb: (-s ours) am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing" by Riley Andrews · 10 years ago
- a120b36 am bce559ec: am c1490ad9: (-s ours) am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing" by Riley Andrews · 10 years ago
- 2aae5a3 am 8310fc5e: am 6eef56fb: (-s ours) am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells." by David Pursell · 10 years ago
- 3ba7c36 am b0e82aaf: am 63a29199: (-s ours) am 87f73de9: am 317acfb8: Merge "Remove confusing variable HOST." by Yabin Cui · 10 years ago
- 5ac86f3 am 5cb8e796: am f236bdda: (-s ours) am 450ed3e8: am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files." by Bertrand Simonnet · 10 years ago
- db5f7f3 am a814ffe1: am 83399202: (-s ours) am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2." by Bertrand Simonnet · 10 years ago
- 2e8091d am 2eac9018: am 864d4985: (-s ours) am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer" by Nick Kralevich · 10 years ago
- c86ed13 am 9c43d4d7: am efc80772: (-s ours) am c01231b3: am 2fb00423: Merge "Always include the adb version in the log." by Elliott Hughes · 10 years ago
- 8cff6fb am 7d5c9eae: am f000f7b2: (-s ours) am 70af6e0b: am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal" by Elliott Hughes · 10 years ago
- b99a3c4 am 090b1531: am 1763d1aa: (-s ours) am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages" by Mark Salyzyn · 10 years ago
- bc3921e am 0b904874: 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
- 5636b8a am 9b80cea0: am 97a8cd95: (-s ours) am e78292f2: am cef3508b: Merge "Add missing includes." by Dan Albert · 10 years ago
- 9093dfd am 77f4d615: am 5cfda541: (-s ours) am c5482138: am ea56594c: Merge "logd: sizes > 1M prune in smaller batches" by Mark Salyzyn · 10 years ago
- ef40152 am 11b2ecae: 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
- 3c75033 am 3c9b4dd2: am 12e77877: (-s ours) am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()" by Tom Cherry · 10 years ago
- d5f6f8a am 2d58f735: am dd35a305: (-s ours) am 86ec2a88: am 162ec8e6: Merge "Ignore adb/*.pyc files" by Yusuke Sato · 10 years ago
- 19f2b48 am 613c91ae: am acfd2b4b: (-s ours) am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux." by Bertrand Simonnet · 10 years ago
- 02cc7c5 am 0f54e0ba: am ccb0806b: (-s ours) am 92b100b3: am 3670eab0: Merge "metricsd: Add Android.mk." by Bertrand Simonnet · 10 years ago
- e9794e5 am 4c8f1d06: am 87538c8f: (-s ours) am 3cc101d6: am e329a3ec: Merge "Remove watchprops." by Elliott Hughes · 10 years ago
- 58ceb2d am dacdc3f4: 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
- fd319c7 am 93cc2ec2: am d0f0f88e: (-s ours) am b6798ebb: am 5a1f9a3e: Merge "Remove the USB vendor id whitelist from fastboot." by Elliott Hughes · 10 years ago
- 019b635 am ba2daca6: am 532df433: (-s ours) am bd1b5f34: am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain" by Gaurav Shah · 10 years ago
- 187447b am af6c90c9: am 9ca8f2fd: (-s ours) am 22f14b0f: am b889d7e4: Merge "crash_reporter: Remove Chrome collector, CrOS build files, DBus" by Gaurav Shah · 10 years ago
- 2e695bf am a17f8bf7: am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd." by Gaurav Shah · 10 years ago
- ea769d7 am 1c8e8c88: am 8c8c6d65: (-s ours) am 0e8acc3c: am 011b2bc3: Merge "metrics: Add a CLI flag to disable dbus." by Gaurav Shah · 10 years ago
- eb3eb7d am 90905ac0: am 594e128f: (-s ours) am fb44650a: am dc15f4cd: Merge "metrics: Enable for non-official builds." by Gaurav Shah · 10 years ago
- e3f1d62 am 63b0b828: am de0bc2a2: (-s ours) am b949867c: am 855b618f: Merge "crash_reporter: Fix header include paths" by Steve Fung · 10 years ago
- 8d98593 am 209d28a8: am c6087a2d: (-s ours) am 7d41a8c8: am 6ada1665: Merge "metrics: Remove send to autotest." by Bertrand Simonnet · 10 years ago
- 995592b am 95d56ba2: am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h." by Bertrand Simonnet · 10 years ago
- 589ef93 am 4e483447: am 7c269663: (-s ours) am f69a27f8: am 182673ec: Merge "metrics: Cleanup the system profile setter." by Bertrand Simonnet · 10 years ago
- f3e519d am a5aeb243: am 077a839b: (-s ours) am 73e5c768: am 38f55079: Merge "metrics: Disable stat collection." by Bertrand Simonnet · 10 years ago
- afe3721 am 17238c24: am 225660dd: (-s ours) am 1cdf6e94: am d16e9c25: Merge "metrics: Don\'t use the policy file." by Bertrand Simonnet · 10 years ago
- 9bd515f am 8f666beb: am fa1db654: (-s ours) am a8b959bb: am 932d61d9: Merge "metrics: Fix import paths for headers." by Bertrand Simonnet · 10 years ago
- fc5f01a am 40e9ccaf: am 841066e7: (-s ours) am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes" by Tom Cherry · 10 years ago
- b7b230a am 4f145188: 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
- ec154dc am 2e73dbae: am 16059f76: (-s ours) am c5cacda5: am 847ec9a8: Merge "More Mac fastboot failure debugging." by Elliott Hughes · 10 years ago
- b63c762 am 1aae6d52: am a4a90243: (-s ours) am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process" by Elliott Hughes · 10 years ago
- 3a5140f am c0e2bff1: am 08fe47e3: (-s ours) am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes" by Elliott Hughes · 10 years ago
- b8cf6ad am 42021f2a: am c684c8de: (-s ours) am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev by Andres Morales · 10 years ago
- 6959ec6 am e332a15a: am fdf14874: (-s ours) resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp by Jeff Sharkey · 10 years ago
- 6c71071 am c49a37d6: am 0e3b339b: (-s ours) am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails." by Elliott Hughes · 10 years ago
- 91eb8ed am 7a94a2e6: am f87bc344: (-s ours) am 802c6fd0: am ff52e23f: Merge "Stop being silly." by Elliott Hughes · 10 years ago
- 4417183 am 1a9f5c29: am a25e258d: (-s ours) am b84e1f54: am 50de8224: Merge "Enable perfboot.py to install APKs before measurement." by Yasuhiro Matsuda · 10 years ago
- 2b63774 am 9552329f: am 93e060e1: (-s ours) am 9e2ed7b0: am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py" by Yasuhiro Matsuda · 10 years ago
- 97cf1c0 am 2bd8457a: am fdb80810: (-s ours) am ee640552: am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C." by Yasuhiro Matsuda · 10 years ago
- 5a77891 am b9f881af: am 056b97d5: (-s ours) am b57438c8: am e4154f46: Merge "perfboot.py: check 2 more event logs by default" by Yusuke Sato · 10 years ago
- 6d2a2b5 am 01807290: am 764b7f56: (-s ours) am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk" by Daniel Rosenberg · 10 years ago
- a68c1e8 am 6feb3ec4: am b5c4bc38: (-s ours) am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo." by Elliott Hughes · 10 years ago
- caf4289 am ead32ed0: am 7ace565f: (-s ours) am 1da90f0c: am feacf20d: Merge "adb: win32: file descriptor reliability improvements" by Elliott Hughes · 10 years ago
- b1fe749 am e6065fdc: 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
- 9db6051 am 882ac0f0: 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
- 24f9e25 am 6cb9ac8e: am fb1dbac1: (-s ours) am eee501ec: am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc" by Elliott Hughes · 10 years ago
- be5b60f am 8c2d0601: am b7c0bfbc: (-s ours) am 14c08745: am 6355f2c1: Merge "adb: win32: call SystemErrorCodeToString() from more places" by Elliott Hughes · 10 years ago
- e964fd1 am b510802b: 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
- 7eec23b am d6468ded: am 48f28797: (-s ours) am 5e34b3ab: am 72488aa0: Merge "perfboot.py: warn if dm-verity is disabled" by Yusuke Sato · 10 years ago
- 1261256 am 8b73be0a: 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