Elliott Hughes
|
ef98e58e9e
|
am 6cec026e: (-s ours) am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
* commit '6cec026e86c4f243bb3149e44546a41006e817d6':
|
2015-08-27 11:54:07 +00:00 |
|
Sergio Giro
|
855c0fb07b
|
am 4d8c1d22: (-s ours) am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"
* commit '4d8c1d22231fadc190f7af9febfd2ba2cad0acf8':
|
2015-08-27 11:54:05 +00:00 |
|
Sergio Giro
|
3730f8beff
|
am ba71601a: (-s ours) am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
* commit 'ba71601aacb3846d7c83cfc89fff689e1b774c54':
|
2015-08-27 11:54:02 +00:00 |
|
Yusuke Sato
|
9ca83e3484
|
am 8e9a1ae5: (-s ours) am 885400fd: am 4d09db9d: Merge "perfboot.py: Add --end-tag option"
* commit '8e9a1ae5936d2bfae23dc0f7414a68973a894209':
|
2015-08-27 11:53:59 +00:00 |
|
Nick Kralevich
|
39411ec9be
|
am eec5baa0: (-s ours) am 77b9868a: am 6d814037: Merge "libutils: fix signed/unsigned comparison warnings"
* commit 'eec5baa0f71d2130eb8b383f9ecbb82d9e171fd0':
|
2015-08-27 11:53:56 +00:00 |
|
Elliott Hughes
|
73d7e78029
|
am 8528d9cf: (-s ours) am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."
* commit '8528d9cfb4ee36c0ffe30b15729873211240e449':
|
2015-08-27 11:53:54 +00:00 |
|
Evgenii Stepanov
|
54d5e92073
|
am 6c74e545: (-s ours) am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '6c74e5454456e7652b80fb6d19292a7a8948123c':
|
2015-08-27 11:53:51 +00:00 |
|
Nick Kralevich
|
df12dfbb0c
|
am d717f86a: (-s ours) am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"
* commit 'd717f86a3ed9bf0878ce67c176755f656cec29c2':
|
2015-08-27 11:53:48 +00:00 |
|
Elliott Hughes
|
16e493e213
|
am 92c1a372: (-s ours) am 5abbd967: am 94a845d9: Merge "Lose ionice and renice to toybox."
* commit '92c1a372341e7da3ac384b0f42b00dabf7a95141':
|
2015-08-27 11:53:43 +00:00 |
|
David Pursell
|
d51ffa0444
|
am f3f5bce2: (-s ours) am 6a701bd9: am b53b521e: Merge "Add adb features."
* commit 'f3f5bce204d264970dcc91b8f0a4149174b4add6':
|
2015-08-27 11:53:38 +00:00 |
|
David Pursell
|
8056ed538f
|
am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner."
* commit 'f53c7af1563dae58d19f1c59fe4a57ab3171e5af':
|
2015-08-27 11:53:34 +00:00 |
|
Elliott Hughes
|
b97fded212
|
am 2733c142: (-s ours) am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1."
* commit '2733c142320acc4eca724f6c4526f096ae34b929':
|
2015-08-27 11:53:31 +00:00 |
|
Elliott Hughes
|
bd363c41f3
|
am 60f9026e: (-s ours) am b4aa1777: am 782daf89: Merge "Fix the Mac libbase build."
* commit '60f9026e4e9cc137458f51a4f6a63ca0bedf2fa6':
|
2015-08-27 11:53:28 +00:00 |
|
Siva Velusamy
|
4b3dce461c
|
am b3d3e245: (-s ours) am ba7284ae: am 4d40c03b: Merge "adb: On Mac, clear both host and device endpoints at startup"
* commit 'b3d3e245854ca498eadf8a6d7a3bc0b5f6cceeea':
|
2015-08-27 11:53:24 +00:00 |
|
Elliott Hughes
|
1374c48b1b
|
am bf449983: (-s ours) am e1c3a7c1: am 45288223: Merge "libbase: logging fixes"
* commit 'bf449983ce68a8eaa0c54ceac801edb32277a43c':
|
2015-08-27 11:53:19 +00:00 |
|
Nick Kralevich
|
3066591a5a
|
am 1deb0317: (-s ours) am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer""
* commit '1deb03179c635c33778815e2fab950aadeeb6600':
|
2015-08-27 11:53:11 +00:00 |
|
Elliott Hughes
|
bb640d5ff4
|
am f36aa8ec: (-s ours) am 5563b77a: am 57532b2a: Merge "adb: improve network error info"
* commit 'f36aa8ec5de6a254d2b2e3849d2d4d203a09ee9f':
|
2015-08-27 11:53:07 +00:00 |
|
Elliott Hughes
|
4ef7772843
|
am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock"
* commit '5e60d25d66caf6b4a7dbbfb3c33c61eecb6a93bf':
|
2015-08-27 11:53:04 +00:00 |
|
Elliott Hughes
|
840a4fe0c7
|
am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output"
* commit '56d11898aa6937df3d1342b7d99dca8813d162a4':
|
2015-08-27 11:52:56 +00:00 |
|
Riley Andrews
|
444f21d4cc
|
am 87ea6cfb: (-s ours) am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
* commit '87ea6cfb6219222fef991713aba21a739bf4f121':
|
2015-08-27 11:52:50 +00:00 |
|
Riley Andrews
|
bce559ec94
|
am c1490ad9: (-s ours) am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
* commit 'c1490ad9a00b34e13e60a3da056b441242449680':
|
2015-08-27 11:52:46 +00:00 |
|
David Pursell
|
8310fc5e72
|
am 6eef56fb: (-s ours) am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells."
* commit '6eef56fb7acf78728840210ac104da9cc0d06fc9':
|
2015-08-27 11:52:43 +00:00 |
|
Yabin Cui
|
b0e82aaf1e
|
am 63a29199: (-s ours) am 87f73de9: am 317acfb8: Merge "Remove confusing variable HOST."
* commit '63a29199f3192a66a1bf7a3127ba879fa7d51d9f':
|
2015-08-27 11:52:33 +00:00 |
|
Bertrand Simonnet
|
5cb8e7963b
|
am f236bdda: (-s ours) am 450ed3e8: am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files."
* commit 'f236bdda07f0b1984abc35dc667de77e2a1e9d14':
|
2015-08-27 11:52:28 +00:00 |
|
Bertrand Simonnet
|
a814ffe1b4
|
am 83399202: (-s ours) am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2."
* commit '833992023c18c61078fd68c6c2d6efba27656a8c':
|
2015-08-27 11:52:26 +00:00 |
|
Nick Kralevich
|
2eac901888
|
am 864d4985: (-s ours) am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer"
* commit '864d4985ed0434974b8d0401dc9c670d186d594a':
|
2015-08-27 11:52:23 +00:00 |
|
Elliott Hughes
|
9c43d4d79f
|
am efc80772: (-s ours) am c01231b3: am 2fb00423: Merge "Always include the adb version in the log."
* commit 'efc8077246a3e816957a774f3d272b909c1c1b12':
|
2015-08-27 11:52:19 +00:00 |
|
Elliott Hughes
|
7d5c9eaef8
|
am f000f7b2: (-s ours) am 70af6e0b: am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal"
* commit 'f000f7b25074f75995477ac72ea2b0a749b87b05':
|
2015-08-27 11:52:16 +00:00 |
|
Mark Salyzyn
|
090b153185
|
am 1763d1aa: (-s ours) am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"
* commit '1763d1aa786ad4df97eeeb0c1fc482b8b29eb2de':
|
2015-08-27 11:52:14 +00:00 |
|
Elliott Hughes
|
0b90487459
|
am 9cb4af39: (-s ours) am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
* commit '9cb4af39af344998be06e91ac97b7cbf24c03904':
|
2015-08-27 11:52:13 +00:00 |
|
Dan Albert
|
9b80cea017
|
am 97a8cd95: (-s ours) am e78292f2: am cef3508b: Merge "Add missing includes."
* commit '97a8cd957f57f8a1f4a469d6df97959397963641':
|
2015-08-27 11:52:11 +00:00 |
|
Mark Salyzyn
|
77f4d6157f
|
am 5cfda541: (-s ours) am c5482138: am ea56594c: Merge "logd: sizes > 1M prune in smaller batches"
* commit '5cfda541dddf170d9065ac49980a899851cf4b4f':
|
2015-08-27 11:52:09 +00:00 |
|
Elliott Hughes
|
11b2ecae3f
|
am e6b72a4e: (-s ours) am 06a9f560: am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"
* commit 'e6b72a4ef65569daa5ecfc36309edd5a5da16e0a':
|
2015-08-27 11:52:08 +00:00 |
|
Tom Cherry
|
3c9b4dd2fa
|
am 12e77877: (-s ours) am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()"
* commit '12e77877e6fa3ddecf6a3e6c7d66fc72af272a98':
|
2015-08-27 11:52:06 +00:00 |
|
Yusuke Sato
|
2d58f735cc
|
am dd35a305: (-s ours) am 86ec2a88: am 162ec8e6: Merge "Ignore adb/*.pyc files"
* commit 'dd35a30547249fa7654e771e13a0510f8a4cdc04':
|
2015-08-27 11:52:04 +00:00 |
|
Bertrand Simonnet
|
613c91ae93
|
am acfd2b4b: (-s ours) am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux."
* commit 'acfd2b4b8bb77f2f5caa27e39b09023079a0196d':
|
2015-08-27 11:52:02 +00:00 |
|
Bertrand Simonnet
|
0f54e0ba8e
|
am ccb0806b: (-s ours) am 92b100b3: am 3670eab0: Merge "metricsd: Add Android.mk."
* commit 'ccb0806b6f458068b49bc5c2b51d1ae8d9e9513d':
|
2015-08-27 11:52:00 +00:00 |
|
Elliott Hughes
|
4c8f1d0675
|
am 87538c8f: (-s ours) am 3cc101d6: am e329a3ec: Merge "Remove watchprops."
* commit '87538c8f51bdd4a30e376ed34828f414f2e3cacc':
|
2015-08-27 11:51:58 +00:00 |
|
Elliott Hughes
|
dacdc3f493
|
am 6396f64f: (-s ours) am 61ff977b: am 1f36ae49: Merge "adb: win32: write ACK to separate pipe instead of stdout"
* commit '6396f64fd795e0ff493e3d59b07ce27076c1170d':
|
2015-08-27 11:51:56 +00:00 |
|
Elliott Hughes
|
93cc2ec29a
|
am d0f0f88e: (-s ours) am b6798ebb: am 5a1f9a3e: Merge "Remove the USB vendor id whitelist from fastboot."
* commit 'd0f0f88e3b4ef346ff7b1e1c4e7edea1a3fda2ce':
|
2015-08-27 11:51:54 +00:00 |
|
Gaurav Shah
|
ba2daca6e5
|
am 532df433: (-s ours) am bd1b5f34: am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain"
* commit '532df43310fdf11510b58d313744b094884287fe':
|
2015-08-27 11:51:52 +00:00 |
|
Gaurav Shah
|
af6c90c932
|
am 9ca8f2fd: (-s ours) am 22f14b0f: am b889d7e4: Merge "crash_reporter: Remove Chrome collector, CrOS build files, DBus"
* commit '9ca8f2fdf183aeef79cf1b4a3ba9c922f7f2abe3':
|
2015-08-27 11:51:51 +00:00 |
|
Gaurav Shah
|
a17f8bf7f4
|
am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."
* commit '118cd2d95be8ab05aa5914ee8bf9f86e215428f2':
|
2015-08-27 11:51:49 +00:00 |
|
Gaurav Shah
|
1c8e8c8838
|
am 8c8c6d65: (-s ours) am 0e8acc3c: am 011b2bc3: Merge "metrics: Add a CLI flag to disable dbus."
* commit '8c8c6d653a93d793ce189efb0b236ed1788a72f0':
|
2015-08-27 11:51:47 +00:00 |
|
Gaurav Shah
|
90905ac02c
|
am 594e128f: (-s ours) am fb44650a: am dc15f4cd: Merge "metrics: Enable for non-official builds."
* commit '594e128fd2f100d226ea98a2e4616dd759f16bf8':
|
2015-08-27 11:51:46 +00:00 |
|
Steve Fung
|
63b0b828ab
|
am de0bc2a2: (-s ours) am b949867c: am 855b618f: Merge "crash_reporter: Fix header include paths"
* commit 'de0bc2a23b4df30b41966a4b504110a958cff6e8':
|
2015-08-27 11:51:44 +00:00 |
|
Bertrand Simonnet
|
209d28a8a9
|
am c6087a2d: (-s ours) am 7d41a8c8: am 6ada1665: Merge "metrics: Remove send to autotest."
* commit 'c6087a2ddb69cbd8d3d8fff68ce2261ff8854311':
|
2015-08-27 11:51:43 +00:00 |
|
Bertrand Simonnet
|
95d56ba2c8
|
am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h."
* commit 'a3400a2c7af8c5d952a88f497e41fbe437bf25c6':
|
2015-08-27 11:51:41 +00:00 |
|
Bertrand Simonnet
|
4e483447fb
|
am 7c269663: (-s ours) am f69a27f8: am 182673ec: Merge "metrics: Cleanup the system profile setter."
* commit '7c2696630f2e5816502b7ca1e4abcb560046c31b':
|
2015-08-27 11:51:39 +00:00 |
|
Bertrand Simonnet
|
a5aeb2431e
|
am 077a839b: (-s ours) am 73e5c768: am 38f55079: Merge "metrics: Disable stat collection."
* commit '077a839bd723bd72e3ef5ecd8454f02d86810b06':
|
2015-08-27 11:51:38 +00:00 |
|