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 |
|
Yusuke Sato
|
d6468ded1f
|
am 48f28797: (-s ours) am 5e34b3ab: am 72488aa0: Merge "perfboot.py: warn if dm-verity is disabled"
* commit '48f2879729d88fe77f5ec0b6f826c7c0f8ed80ae':
|
2015-08-27 11:50:30 +00:00 |
|
Elliott Hughes
|
8b73be0a86
|
am 8f13dc42: (-s ours) am 6eb9aa62: am 6bf93400: Merge "adb: fix mkdirs / adb pull with relative paths, fix win32 issues"
* commit '8f13dc422607b8c82e80e96d85ac8e0a5f9eb36e':
|
2015-08-27 11:50:26 +00:00 |
|
Elliott Hughes
|
3d1653b9d9
|
am bc3c21b9: (-s ours) am c3766916: am 8c61e029: Merge "adb_test/libbase_test: win32: get some tests working"
* commit 'bc3c21b93f8d0529ba992fa18bd99c4d9b5cd625':
|
2015-08-27 11:50:22 +00:00 |
|
Elliott Hughes
|
8d02c097c2
|
am a121a81f: (-s ours) am 07522aae: am bb3b45d2: Merge "libbase_test: win32: get some tests working"
* commit 'a121a81f5cb2fb92903731705a9e2fa72968afbd':
|
2015-08-27 11:50:18 +00:00 |
|
Tom Cherry
|
380cc33fb8
|
am b6545bf5: (-s ours) am 0070026c: am 4247ebfd: Merge "init: use std::vector<std::string> for argument passing"
* commit 'b6545bf559d491f17e30af4fc3071489a3ea9755':
|
2015-08-27 11:50:14 +00:00 |
|
Todd Kennedy
|
2aee50f212
|
am 94927221: (-s ours) am 1f6204a8: am 6782ca0b: Merge "Add a trace constant for PackageManager"
* commit '9492722131ccb5280f29c161211399f8d93b8fef':
|
2015-08-27 11:50:11 +00:00 |
|
Elliott Hughes
|
93b575041d
|
am 3f0a0142: (-s ours) am d2984900: am 11ca81fc: Merge "Remove adb\'s unused get_my_path for Windows."
* commit '3f0a0142818a3e540306d70f43e5c87b4e232465':
|
2015-08-27 11:50:07 +00:00 |
|
Yabin Cui
|
8f0daa520d
|
am 2df4804a: (-s ours) am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection."
* commit '2df4804ace526029b622c34e3200e6d71f2f265a':
|
2015-08-27 11:50:04 +00:00 |
|
Jorge Lucangeli Obes
|
23bac12e4b
|
am df01d12e: (-s ours) am 45ca3d54: am a336cbcd: Merge "Reserve new UID range for OEM."
* commit 'df01d12e14a7dc819f05bf0b1c6c137b3c105d5c':
|
2015-08-27 11:50:01 +00:00 |
|
Elliott Hughes
|
adf9165f44
|
am 66429b34: (-s ours) am b8b71186: am 367fb503: Merge "adb: win32: Unicode path names, env vars, some console support"
* commit '66429b34d056b5b638936744a71d49ceb863de94':
|
2015-08-27 11:49:57 +00:00 |
|
Yusuke Sato
|
b1696f6436
|
am 23ec3e46: (-s ours) am 2f9e1db3: am b5d6ad81: Merge "Stop calling fsck on shutdown by default"
* commit '23ec3e468b6111d1f610df6f8eb1340016ce5732':
|
2015-08-27 11:49:54 +00:00 |
|
Lee Campbell
|
8c8f16393b
|
am 7ff4bb7e: (-s ours) am 150c05fe: am 0f918878: Merge "init: Adding header guard to tokenizer"
* commit '7ff4bb7e47e1a64e5171d946c1466c8146b1bb93':
|
2015-08-27 11:49:51 +00:00 |
|
Elliott Hughes
|
9eb6530c80
|
am 5e6d1dcf: (-s ours) am 3d561748: am ec035950: Merge "Clean up -p handling slightly."
* commit '5e6d1dcfac43422a135b1540c4bb245bfe89b294':
|
2015-08-27 11:49:49 +00:00 |
|
Elliott Hughes
|
f552ddc013
|
am c0d738f3: (-s ours) am 6dca1987: am cf4dba5a: Merge "adb: win32: initial IPv6 support and improved Winsock error reporting"
* commit 'c0d738f3314952d7677d74bf97e833aeaa16e553':
|
2015-08-27 11:49:48 +00:00 |
|
Yabin Cui
|
dad02d9eef
|
am 739349cd: (-s ours) am a6fda917: am dc1fb361: Merge "Make clear of the data length sent by write_packet."
* commit '739349cd13735f9d04bf2064a693d34ebd656713':
|
2015-08-27 11:49:46 +00:00 |
|
Elliott Hughes
|
e0dd7955cb
|
am e0b43a17: (-s ours) resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp
* commit 'e0b43a17852081c2fe1c0d2207006e421ffcc74b':
|
2015-08-27 11:49:44 +00:00 |
|
Elliott Hughes
|
5d238ddc15
|
am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp
* commit 'd2117974e4c22ff6b8967c3b5cd2d497a6ffc856':
|
2015-08-27 11:49:42 +00:00 |
|
Tom Cherry
|
9b3b9002de
|
am 97d393bb: (-s ours) am a21d8562: am d548e30f: Merge "init: Create classes for Action and Command"
* commit '97d393bb2d7f2dad83a9e14f9a4aba5a018ef0b8':
|
2015-08-27 11:49:40 +00:00 |