Bertrand Simonnet
|
b93c60dc04
|
am c2ba04b9: am 60413943: (-s ours) am 2888eec0: am 565d20ef: Merge "metricsd: Enable https by default."
* commit 'c2ba04b90fc1b787b4e4f39c391ed49d20ce2434':
|
2015-08-27 14:36:49 +00:00 |
|
Mark Salyzyn
|
e69b1d170b
|
am 4dfd9c16: am 982bbea0: (-s ours) am 2a04ec35: am 07ee12aa: Merge "logd: worst uid record watermark"
* commit '4dfd9c169a8c9c42f12e6a9cd87e50c2debb9ef8':
|
2015-08-27 14:36:47 +00:00 |
|
Mark Salyzyn
|
d10c42e7b9
|
am e8d44c50: am 76cbf5f3: (-s ours) am 44a7da74: am 2c1b8f9e: Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4
* commit 'e8d44c50c7d2a37c197400ea0b52449350127864':
|
2015-08-27 14:36:45 +00:00 |
|
Elliott Hughes
|
7281c61d39
|
am fc9b1bb7: am 425702fa: (-s ours) am 89b26e28: am e03d0322: Merge "fastboot should say which device it\'s waiting for."
* commit 'fc9b1bb75e4c51a910884c88845b1023d8314737':
|
2015-08-27 14:36:43 +00:00 |
|
Elliott Hughes
|
13697b9a5f
|
am 6a90d9b3: am 338c8669: (-s ours) am 2a2c2036: am e728eb91: Merge "Get fastboot working on OS X"
* commit '6a90d9b3eeee581d37dc329327a5cd1525e32503':
|
2015-08-27 14:36:41 +00:00 |
|
Daniel Erat
|
0ad824b9f2
|
am 28a49acd: am f10e1ed1: (-s ours) am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__."
* commit '28a49acd40521f9825a0674672c3ad75f952b6d7':
|
2015-08-27 14:36:39 +00:00 |
|
Steve Fung
|
8d6a381039
|
am 05b22083: am 61c677c8: (-s ours) am cbc6b915: am d4555689: Merge "crash_reporter: Enable core dumps"
* commit '05b2208370a2c50ab48189bb3985f0b970d9e7c0':
|
2015-08-27 14:36:37 +00:00 |
|
Bertrand Simonnet
|
b0a9982dc0
|
am 78107c55: am 6905b112: (-s ours) am cb1e29a9: am 0172dea6: Merge "metrics: Add init script for metrics_daemon."
* commit '78107c5584cd156d29533c78e34db566e84bcd8f':
|
2015-08-27 14:36:34 +00:00 |
|
Yusuke Sato
|
6e1656ce65
|
am aee7db81: am 2ef82cff: (-s ours) am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"
* commit 'aee7db815235f64896b38cba74a06523a8bee5f7':
|
2015-08-27 14:36:32 +00:00 |
|
Elliott Hughes
|
73f3726366
|
am ac3836b5: am 22b510ad: (-s ours) am 2b0deb91: am a169f3b4: Merge "adb: win32: fix unittest exit code parsing"
* commit 'ac3836b52dc0a619602ea29d3f1215bf119205b0':
|
2015-08-27 14:36:30 +00:00 |
|
Elliott Hughes
|
2c89cd80a6
|
am ef98e58e: am 6cec026e: (-s ours) am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
* commit 'ef98e58e9eda2d00da3cc4dfb1b78c4b04f6242b':
|
2015-08-27 14:36:28 +00:00 |
|
Sergio Giro
|
c8857585fb
|
am 855c0fb0: am 4d8c1d22: (-s ours) am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"
* commit '855c0fb07b1c9534f4783b4212eaeb1de296a4eb':
|
2015-08-27 14:36:25 +00:00 |
|
Sergio Giro
|
b1afdf0b70
|
am 3730f8be: am ba71601a: (-s ours) am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
* commit '3730f8beffa99cc439dff63f24020e03e39e443c':
|
2015-08-27 14:36:23 +00:00 |
|
Yusuke Sato
|
019f190b15
|
am 9ca83e34: am 8e9a1ae5: (-s ours) am 885400fd: am 4d09db9d: Merge "perfboot.py: Add --end-tag option"
* commit '9ca83e34846eecae033d71b9069d1213cfc1f973':
|
2015-08-27 14:36:21 +00:00 |
|
Nick Kralevich
|
f53ae245da
|
am 39411ec9: am eec5baa0: (-s ours) am 77b9868a: am 6d814037: Merge "libutils: fix signed/unsigned comparison warnings"
* commit '39411ec9be7ef030fd155b1949dc22e4fe1b456c':
|
2015-08-27 14:36:18 +00:00 |
|
Elliott Hughes
|
7fc6e09a79
|
am 73d7e780: am 8528d9cf: (-s ours) am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."
* commit '73d7e7802958df753fe91d3c89234c7f93abf988':
|
2015-08-27 14:36:15 +00:00 |
|
Evgenii Stepanov
|
f31d98fda4
|
am 54d5e920: am 6c74e545: (-s ours) am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '54d5e920731957393d6550764dd2b1b3d860f2b8':
|
2015-08-27 14:36:11 +00:00 |
|
Nick Kralevich
|
91b8a8046b
|
am df12dfbb: am d717f86a: (-s ours) am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"
* commit 'df12dfbb0cdb2ce107cac4cc6384673970bfe25a':
|
2015-08-27 14:36:08 +00:00 |
|
Elliott Hughes
|
448ac5fe5c
|
am 16e493e2: am 92c1a372: (-s ours) am 5abbd967: am 94a845d9: Merge "Lose ionice and renice to toybox."
* commit '16e493e213e23487fc0b219b306e41256d75604b':
|
2015-08-27 14:36:05 +00:00 |
|
David Pursell
|
acafd5c1ad
|
am d51ffa04: am f3f5bce2: (-s ours) am 6a701bd9: am b53b521e: Merge "Add adb features."
* commit 'd51ffa04441e6ad17f2146a5d547f4cb852a26d0':
|
2015-08-27 14:36:01 +00:00 |
|
David Pursell
|
3677df3848
|
am 8056ed53: am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner."
* commit '8056ed538f7ef534d9595db0b8f20721a807e963':
|
2015-08-27 14:35:58 +00:00 |
|
Elliott Hughes
|
83f16eca6f
|
am b97fded2: am 2733c142: (-s ours) am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1."
* commit 'b97fded2121b45c87c09167a304a6bf6ba03ec46':
|
2015-08-27 14:35:54 +00:00 |
|
Elliott Hughes
|
3c94830ce4
|
am bd363c41: am 60f9026e: (-s ours) am b4aa1777: am 782daf89: Merge "Fix the Mac libbase build."
* commit 'bd363c41f3d2c5c32d68a24f648718cda1da915f':
|
2015-08-27 14:35:50 +00:00 |
|
Siva Velusamy
|
e1bce8700b
|
am 4b3dce46: am b3d3e245: (-s ours) am ba7284ae: am 4d40c03b: Merge "adb: On Mac, clear both host and device endpoints at startup"
* commit '4b3dce461cb8c29f08af51f4f7965a67b5791cbb':
|
2015-08-27 14:35:47 +00:00 |
|
Elliott Hughes
|
43db941632
|
am 1374c48b: am bf449983: (-s ours) am e1c3a7c1: am 45288223: Merge "libbase: logging fixes"
* commit '1374c48b1b92a2713a8126402ab87877ee49fb5d':
|
2015-08-27 14:35:36 +00:00 |
|
Nick Kralevich
|
19845beebd
|
am 3066591a: am 1deb0317: (-s ours) am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer""
* commit '3066591a5a7c2d7ed9706cfeb4ca00c17583d6b7':
|
2015-08-27 14:35:29 +00:00 |
|
Elliott Hughes
|
094595c2a9
|
am bb640d5f: am f36aa8ec: (-s ours) am 5563b77a: am 57532b2a: Merge "adb: improve network error info"
* commit 'bb640d5ff4c6cb924cc1b7354c396d6c4a3b679a':
|
2015-08-27 14:35:24 +00:00 |
|
Elliott Hughes
|
fba31d2d1e
|
am 4ef77728: am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock"
* commit '4ef777284333ad87e5b4d99b81d65a75ebd821a9':
|
2015-08-27 14:35:20 +00:00 |
|
Elliott Hughes
|
0be394f8ca
|
am 840a4fe0: am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output"
* commit '840a4fe0c79a0af53621e3c81af3b35c9163ddf2':
|
2015-08-27 14:35:16 +00:00 |
|
Riley Andrews
|
156ed2f05b
|
am 444f21d4: am 87ea6cfb: (-s ours) am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
* commit '444f21d4cc3a5703a99063f89a1f2cd72920394b':
|
2015-08-27 14:35:12 +00:00 |
|
Riley Andrews
|
02f427fc79
|
am bce559ec: am c1490ad9: (-s ours) am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
* commit 'bce559ec946541671a65ce5968dc4658d2155258':
|
2015-08-27 14:34:59 +00:00 |
|
David Pursell
|
e49b7bfbe8
|
am 8310fc5e: am 6eef56fb: (-s ours) am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells."
* commit '8310fc5e7203a2fb995ef6f3e7e9ac80e75414ad':
|
2015-08-27 14:34:55 +00:00 |
|
Yabin Cui
|
e590f928da
|
am b0e82aaf: am 63a29199: (-s ours) am 87f73de9: am 317acfb8: Merge "Remove confusing variable HOST."
* commit 'b0e82aaf1ed59b7bf06e61d5576586f8c7a4ed2b':
|
2015-08-27 14:34:51 +00:00 |
|
Bertrand Simonnet
|
f40aca11e4
|
am 5cb8e796: am f236bdda: (-s ours) am 450ed3e8: am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files."
* commit '5cb8e7963bdcb45e63148bf098feb80cb372f20e':
|
2015-08-27 14:34:48 +00:00 |
|
Bertrand Simonnet
|
bea63ff567
|
am a814ffe1: am 83399202: (-s ours) am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2."
* commit 'a814ffe1b46f59c88fa7f3644c2b332b52a09d2d':
|
2015-08-27 14:34:44 +00:00 |
|
Nick Kralevich
|
70710271c9
|
am 2eac9018: am 864d4985: (-s ours) am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer"
* commit '2eac901888286c2e5e3c61566668c9ea52832463':
|
2015-08-27 14:34:40 +00:00 |
|
Elliott Hughes
|
cb47e00c6b
|
am 9c43d4d7: am efc80772: (-s ours) am c01231b3: am 2fb00423: Merge "Always include the adb version in the log."
* commit '9c43d4d79fd425c2ef4b8a8ba462d8e715996036':
|
2015-08-27 14:34:29 +00:00 |
|
Elliott Hughes
|
5cc10eb6e4
|
am 7d5c9eae: am f000f7b2: (-s ours) am 70af6e0b: am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal"
* commit '7d5c9eaef865d1b979f06b581aeeef4fa7357b7a':
|
2015-08-27 14:34:25 +00:00 |
|
Mark Salyzyn
|
3cadc4c906
|
am 090b1531: am 1763d1aa: (-s ours) am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"
* commit '090b1531858509ff193fae250187bbad24c8e098':
|
2015-08-27 14:34:22 +00:00 |
|
Elliott Hughes
|
a48bb059df
|
am 0b904874: am 9cb4af39: (-s ours) am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
* commit '0b904874590cacccaa9b7a95980fa63ca4804aa4':
|
2015-08-27 14:34:19 +00:00 |
|
Dan Albert
|
3a3b6b8f0b
|
am 9b80cea0: am 97a8cd95: (-s ours) am e78292f2: am cef3508b: Merge "Add missing includes."
* commit '9b80cea017c83ce8e836f5f2339460662e7a5b1a':
|
2015-08-27 14:34:16 +00:00 |
|
Mark Salyzyn
|
0f14fee5d6
|
am 77f4d615: am 5cfda541: (-s ours) am c5482138: am ea56594c: Merge "logd: sizes > 1M prune in smaller batches"
* commit '77f4d6157f71c8c91f80ae4645d4334038e4dbff':
|
2015-08-27 14:34:13 +00:00 |
|
Elliott Hughes
|
0fea1e8048
|
am 11b2ecae: am e6b72a4e: (-s ours) am 06a9f560: am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"
* commit '11b2ecae3fe624510657d1d536b5f13872985dd7':
|
2015-08-27 14:34:11 +00:00 |
|
Tom Cherry
|
c8230fc0bc
|
am 3c9b4dd2: am 12e77877: (-s ours) am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()"
* commit '3c9b4dd2faf33f1de20e5a6699e96e165ed5e5c9':
|
2015-08-27 14:34:08 +00:00 |
|
Yusuke Sato
|
365baf19bb
|
am 2d58f735: am dd35a305: (-s ours) am 86ec2a88: am 162ec8e6: Merge "Ignore adb/*.pyc files"
* commit '2d58f735cca9f1a61dfa985f27afe960a51cb0b9':
|
2015-08-27 14:34:05 +00:00 |
|
Bertrand Simonnet
|
b9e7690b4b
|
am 613c91ae: am acfd2b4b: (-s ours) am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux."
* commit '613c91ae932bab8446403df3c9a01dea02bccc1e':
|
2015-08-27 14:34:02 +00:00 |
|
Bertrand Simonnet
|
92bd9a844d
|
am 0f54e0ba: am ccb0806b: (-s ours) am 92b100b3: am 3670eab0: Merge "metricsd: Add Android.mk."
* commit '0f54e0ba8e35d666febc3a83ea54f8b0fd2af477':
|
2015-08-27 14:34:00 +00:00 |
|
Elliott Hughes
|
35cca2971a
|
am 4c8f1d06: am 87538c8f: (-s ours) am 3cc101d6: am e329a3ec: Merge "Remove watchprops."
* commit '4c8f1d06752baab788e42371c3716977b9573107':
|
2015-08-27 14:33:57 +00:00 |
|
Elliott Hughes
|
803f339556
|
am dacdc3f4: am 6396f64f: (-s ours) am 61ff977b: am 1f36ae49: Merge "adb: win32: write ACK to separate pipe instead of stdout"
* commit 'dacdc3f493e188f46c64998de21ba64b32d2ceaf':
|
2015-08-27 14:33:54 +00:00 |
|
Elliott Hughes
|
cddc519db8
|
am 93cc2ec2: am d0f0f88e: (-s ours) am b6798ebb: am 5a1f9a3e: Merge "Remove the USB vendor id whitelist from fastboot."
* commit '93cc2ec29aebad01c2e9b53623340e236a4c5ec4':
|
2015-08-27 14:33:52 +00:00 |
|