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 |
|
Gaurav Shah
|
6c4f88630e
|
am ba2daca6: am 532df433: (-s ours) am bd1b5f34: am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain"
* commit 'ba2daca6e572096ffd0c8eb4bbb46c116709bb83':
|
2015-08-27 14:33:49 +00:00 |
|
Gaurav Shah
|
983b174008
|
am af6c90c9: am 9ca8f2fd: (-s ours) am 22f14b0f: am b889d7e4: Merge "crash_reporter: Remove Chrome collector, CrOS build files, DBus"
* commit 'af6c90c9325674a9b287c9c2f7ba59cd4bf8f42e':
|
2015-08-27 14:33:46 +00:00 |
|
Gaurav Shah
|
96cf737a2f
|
am a17f8bf7: am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."
* commit 'a17f8bf7f4890a23847d39f02a9bc173b902a94a':
|
2015-08-27 14:33:44 +00:00 |
|
Gaurav Shah
|
948e9c027e
|
am 1c8e8c88: am 8c8c6d65: (-s ours) am 0e8acc3c: am 011b2bc3: Merge "metrics: Add a CLI flag to disable dbus."
* commit '1c8e8c883823fbfb9638194aaadb89ed7ae39266':
|
2015-08-27 14:33:41 +00:00 |
|
Gaurav Shah
|
797dbecc8f
|
am 90905ac0: am 594e128f: (-s ours) am fb44650a: am dc15f4cd: Merge "metrics: Enable for non-official builds."
* commit '90905ac02c89f812e4cd894127e4e59beb85dd49':
|
2015-08-27 14:33:38 +00:00 |
|
Steve Fung
|
a29b70dcfe
|
am 63b0b828: am de0bc2a2: (-s ours) am b949867c: am 855b618f: Merge "crash_reporter: Fix header include paths"
* commit '63b0b828ab5f4aca47bbf480a0e45bc269f6735c':
|
2015-08-27 14:33:36 +00:00 |
|
Bertrand Simonnet
|
2e9b1079b3
|
am 209d28a8: am c6087a2d: (-s ours) am 7d41a8c8: am 6ada1665: Merge "metrics: Remove send to autotest."
* commit '209d28a8a96010fddfb45bc68773fd9b9f1a60d5':
|
2015-08-27 14:33:33 +00:00 |
|
Bertrand Simonnet
|
2544daffb4
|
am 95d56ba2: am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h."
* commit '95d56ba2c8b75145d4da5977b14feb85552039c7':
|
2015-08-27 14:33:30 +00:00 |
|
Bertrand Simonnet
|
8b229f765f
|
am 4e483447: am 7c269663: (-s ours) am f69a27f8: am 182673ec: Merge "metrics: Cleanup the system profile setter."
* commit '4e483447fba9628f41a25342b197febf7ab43586':
|
2015-08-27 14:33:27 +00:00 |
|
Bertrand Simonnet
|
e9dc39030f
|
am a5aeb243: am 077a839b: (-s ours) am 73e5c768: am 38f55079: Merge "metrics: Disable stat collection."
* commit 'a5aeb2431e5d577787e5ef4aaafe203caa65b69c':
|
2015-08-27 14:33:24 +00:00 |
|
Bertrand Simonnet
|
eb1973f502
|
am 17238c24: am 225660dd: (-s ours) am 1cdf6e94: am d16e9c25: Merge "metrics: Don\'t use the policy file."
* commit '17238c24b501521cb6bb59eb27465caa4fd04db7':
|
2015-08-27 14:33:21 +00:00 |
|
Bertrand Simonnet
|
1d967d1aa9
|
am 8f666beb: am fa1db654: (-s ours) am a8b959bb: am 932d61d9: Merge "metrics: Fix import paths for headers."
* commit '8f666bebcf591e2467e9e791f4bebb80a8fb3b81':
|
2015-08-27 14:33:17 +00:00 |
|
Tom Cherry
|
d7bf6050f4
|
am 40e9ccaf: am 841066e7: (-s ours) am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes"
* commit '40e9ccaf97bd6c6f03c08723edf5c9f982b82aec':
|
2015-08-27 14:33:13 +00:00 |
|
Elliott Hughes
|
0072c7a324
|
am 4f145188: am 184585c4: (-s ours) am af60acef: am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK"
* commit '4f145188afd2f2a45904675456a38bebbcf89fb4':
|
2015-08-27 14:33:05 +00:00 |
|
Elliott Hughes
|
f623dbf607
|
am 2e73dbae: am 16059f76: (-s ours) am c5cacda5: am 847ec9a8: Merge "More Mac fastboot failure debugging."
* commit '2e73dbae2abe9f4d5c0ea7775dfb580f12528508':
|
2015-08-27 14:33:00 +00:00 |
|
Elliott Hughes
|
d0e878e5f0
|
am 1aae6d52: am a4a90243: (-s ours) am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process"
* commit '1aae6d526ef7fbe0ade1875f68a12d4b7651b8a1':
|
2015-08-27 14:32:55 +00:00 |
|
Elliott Hughes
|
91c996b6fd
|
am c0e2bff1: am 08fe47e3: (-s ours) am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes"
* commit 'c0e2bff17c00f891aad4f945e6ff9f749e505b32':
|
2015-08-27 14:32:45 +00:00 |
|
Andres Morales
|
530a81c332
|
am 42021f2a: am c684c8de: (-s ours) am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev
* commit '42021f2acb6a5daead7242345d039b3ce354afca':
|
2015-08-27 14:32:36 +00:00 |
|
Jeff Sharkey
|
77e9c867c1
|
am e332a15a: am fdf14874: (-s ours) resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp
* commit 'e332a15ad7e82289fb5d0dd17579d9a925bb2ce6':
|
2015-08-27 14:32:31 +00:00 |
|
Elliott Hughes
|
a0a353a855
|
am c49a37d6: am 0e3b339b: (-s ours) am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails."
* commit 'c49a37d69c9bc68603dd5d23581ad4891254089e':
|
2015-08-27 14:32:20 +00:00 |
|
Elliott Hughes
|
7b98a12b92
|
am 7a94a2e6: am f87bc344: (-s ours) am 802c6fd0: am ff52e23f: Merge "Stop being silly."
* commit '7a94a2e6397dade98c3025a2bc87c7e67e27e096':
|
2015-08-27 14:32:15 +00:00 |
|
Yasuhiro Matsuda
|
a73f267218
|
am 1a9f5c29: am a25e258d: (-s ours) am b84e1f54: am 50de8224: Merge "Enable perfboot.py to install APKs before measurement."
* commit '1a9f5c293c7a1f901666839d0a9f6984d09ab38c':
|
2015-08-27 14:32:10 +00:00 |
|
Yasuhiro Matsuda
|
57124a7eaf
|
am 9552329f: am 93e060e1: (-s ours) am 9e2ed7b0: am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"
* commit '9552329f1e81f365836ce0fed2a99c6225b2c736':
|
2015-08-27 14:32:01 +00:00 |
|
Yasuhiro Matsuda
|
9d65d9d84a
|
am 2bd8457a: am fdb80810: (-s ours) am ee640552: am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C."
* commit '2bd8457a87d4a2ac6172f998085a345d4aa3cfc6':
|
2015-08-27 14:31:56 +00:00 |
|
Yusuke Sato
|
56f36f783e
|
am b9f881af: am 056b97d5: (-s ours) am b57438c8: am e4154f46: Merge "perfboot.py: check 2 more event logs by default"
* commit 'b9f881afeeed59903e4718b45a90bb5bec85ff17':
|
2015-08-27 14:31:48 +00:00 |
|
Daniel Rosenberg
|
8545b86a0e
|
am 01807290: am 764b7f56: (-s ours) am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
* commit '01807290f932c905750644ae4dad4c331fb8cca4':
|
2015-08-27 14:31:45 +00:00 |
|
Elliott Hughes
|
b12237ab71
|
am 6feb3ec4: am b5c4bc38: (-s ours) am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo."
* commit '6feb3ec46cc5fe72b6680b61513673e75779c45e':
|
2015-08-27 14:31:41 +00:00 |
|
Elliott Hughes
|
462a2ac7b5
|
am ead32ed0: am 7ace565f: (-s ours) am 1da90f0c: am feacf20d: Merge "adb: win32: file descriptor reliability improvements"
* commit 'ead32ed04319e8f26dd63cd176ab0b13d5d1e195':
|
2015-08-27 14:31:38 +00:00 |
|
Daniel Rosenberg
|
209398ac7d
|
am e6065fdc: am 88f82b66: (-s ours) am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed."
* commit 'e6065fdcb8f35ab35ab46cce754b5b3b85c54991':
|
2015-08-27 14:31:35 +00:00 |
|
Yusuke Sato
|
40f47b0840
|
am 882ac0f0: am 9358ae91: (-s ours) am 69386e33: am 81fd50c3: Merge "perfboot.py: ignore tags not listed in /system/etc/event-log-tags"
* commit '882ac0f0ca541482035cb678e6eb5c67a490ef7a':
|
2015-08-27 14:31:33 +00:00 |
|
Elliott Hughes
|
69cc002850
|
am 6cb9ac8e: am fb1dbac1: (-s ours) am eee501ec: am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc"
* commit '6cb9ac8ec9ff70ffc99ded11ab3045cc9a350877':
|
2015-08-27 14:31:31 +00:00 |
|