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 |
|
Bertrand Simonnet
|
17238c24b5
|
am 225660dd: (-s ours) am 1cdf6e94: am d16e9c25: Merge "metrics: Don\'t use the policy file."
* commit '225660dd7becaa1c1d67389d22d263342d3d8856':
|
2015-08-27 11:51:37 +00:00 |
|
Bertrand Simonnet
|
8f666bebcf
|
am fa1db654: (-s ours) am a8b959bb: am 932d61d9: Merge "metrics: Fix import paths for headers."
* commit 'fa1db65469873799d4e3e247e4830d27e551edaf':
|
2015-08-27 11:51:36 +00:00 |
|
Tom Cherry
|
40e9ccaf97
|
am 841066e7: (-s ours) am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes"
* commit '841066e778c8e6d8c401b843d9df050b94b69bb4':
|
2015-08-27 11:51:34 +00:00 |
|
Elliott Hughes
|
4f145188af
|
am 184585c4: (-s ours) am af60acef: am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK"
* commit '184585c417a4411b18ba41d938501ab3f5b25267':
|
2015-08-27 11:51:32 +00:00 |
|
Elliott Hughes
|
2e73dbae2a
|
am 16059f76: (-s ours) am c5cacda5: am 847ec9a8: Merge "More Mac fastboot failure debugging."
* commit '16059f762de035f719eafde2237312cb23972a17':
|
2015-08-27 11:51:31 +00:00 |
|
Elliott Hughes
|
1aae6d526e
|
am a4a90243: (-s ours) am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process"
* commit 'a4a902432e45933e86f40f25eb4ab96743f61ebd':
|
2015-08-27 11:51:29 +00:00 |
|
Elliott Hughes
|
c0e2bff17c
|
am 08fe47e3: (-s ours) am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes"
* commit '08fe47e3bdc3c119c37539da9b013bd6510b0fa7':
|
2015-08-27 11:51:27 +00:00 |
|
Andres Morales
|
42021f2acb
|
am c684c8de: (-s ours) am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev
* commit 'c684c8de83dbacf6e21706e3d8eb4be6dab562f6':
|
2015-08-27 11:51:25 +00:00 |
|
Jeff Sharkey
|
e332a15ad7
|
am fdf14874: (-s ours) resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp
* commit 'fdf14874930e92933eda7c756fd3bfe1f5e6c09a':
|
2015-08-27 11:51:24 +00:00 |
|
Elliott Hughes
|
c49a37d69c
|
am 0e3b339b: (-s ours) am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails."
* commit '0e3b339bbb43a058b4c8397655b31d774b9e1d3a':
|
2015-08-27 11:51:22 +00:00 |
|
Elliott Hughes
|
7a94a2e639
|
am f87bc344: (-s ours) am 802c6fd0: am ff52e23f: Merge "Stop being silly."
* commit 'f87bc34412dc11ee59319cd5aba7b34d14f51b85':
|
2015-08-27 11:51:20 +00:00 |
|
Yasuhiro Matsuda
|
1a9f5c293c
|
am a25e258d: (-s ours) am b84e1f54: am 50de8224: Merge "Enable perfboot.py to install APKs before measurement."
* commit 'a25e258d657e61f63ed1d278224f49ed244d59d2':
|
2015-08-27 11:51:18 +00:00 |
|
Yasuhiro Matsuda
|
9552329f1e
|
am 93e060e1: (-s ours) am 9e2ed7b0: am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"
* commit '93e060e1155cb36a8a76ddb64e3dac322df9a8bb':
|
2015-08-27 11:51:16 +00:00 |
|
Yasuhiro Matsuda
|
2bd8457a87
|
am fdb80810: (-s ours) am ee640552: am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C."
* commit 'fdb80810a279f75428b44e566a2bd85e33b90f96':
|
2015-08-27 11:51:13 +00:00 |
|
Yusuke Sato
|
b9f881afee
|
am 056b97d5: (-s ours) am b57438c8: am e4154f46: Merge "perfboot.py: check 2 more event logs by default"
* commit '056b97d50931affc85d250d6eb40c720cf408366':
|
2015-08-27 11:51:09 +00:00 |
|
Daniel Rosenberg
|
01807290f9
|
am 764b7f56: (-s ours) am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
* commit '764b7f561ba5bcecd94b7dd342bab2bf8cc287b7':
|
2015-08-27 11:51:06 +00:00 |
|
Elliott Hughes
|
6feb3ec46c
|
am b5c4bc38: (-s ours) am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo."
* commit 'b5c4bc38336aed56ab6a4ac6e71afebc411890f3':
|
2015-08-27 11:51:03 +00:00 |
|
Elliott Hughes
|
ead32ed043
|
am 7ace565f: (-s ours) am 1da90f0c: am feacf20d: Merge "adb: win32: file descriptor reliability improvements"
* commit '7ace565f6ba8e6b78b1b5a4e96365de923757841':
|
2015-08-27 11:50:59 +00:00 |
|
Daniel Rosenberg
|
e6065fdcb8
|
am 88f82b66: (-s ours) am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed."
* commit '88f82b66503c684650ce0f6fb68173d101aa672e':
|
2015-08-27 11:50:56 +00:00 |
|
Yusuke Sato
|
882ac0f0ca
|
am 9358ae91: (-s ours) am 69386e33: am 81fd50c3: Merge "perfboot.py: ignore tags not listed in /system/etc/event-log-tags"
* commit '9358ae91c9d260fa75244942b611e00d2fb02ddc':
|
2015-08-27 11:50:52 +00:00 |
|
Elliott Hughes
|
6cb9ac8ec9
|
am fb1dbac1: (-s ours) am eee501ec: am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc"
* commit 'fb1dbac1439eb0ed2a95fa64a74c5257b20992e3':
|
2015-08-27 11:50:47 +00:00 |
|
Elliott Hughes
|
8c2d060133
|
am b7c0bfbc: (-s ours) am 14c08745: am 6355f2c1: Merge "adb: win32: call SystemErrorCodeToString() from more places"
* commit 'b7c0bfbc5e48b333fdc6544578ec58281fab7c3d':
|
2015-08-27 11:50:43 +00:00 |
|
Elliott Hughes
|
b510802b5e
|
am e043761c: (-s ours) am c783e1a3: am 0fac7fd1: Merge "Leave the evidence lying around if an adb test fails."
* commit 'e043761c7abe5f40c272d945ea1a7f1b845225ee':
|
2015-08-27 11:50:35 +00:00 |
|