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 |
|
Elliott Hughes
|
808fcb3c9e
|
am 8c2d0601: am b7c0bfbc: (-s ours) am 14c08745: am 6355f2c1: Merge "adb: win32: call SystemErrorCodeToString() from more places"
* commit '8c2d06013395487892add3044d8cdc807946215e':
|
2015-08-27 14:31:30 +00:00 |
|
Elliott Hughes
|
74bed78535
|
am b510802b: am e043761c: (-s ours) am c783e1a3: am 0fac7fd1: Merge "Leave the evidence lying around if an adb test fails."
* commit 'b510802b5eb4af9d5da9b7f8d8c49cf5fa29928e':
|
2015-08-27 14:31:28 +00:00 |
|
Yusuke Sato
|
0b61fe6200
|
am d6468ded: am 48f28797: (-s ours) am 5e34b3ab: am 72488aa0: Merge "perfboot.py: warn if dm-verity is disabled"
* commit 'd6468ded1f39bf91daed1eb6f5ddc8c9ee8ceeba':
|
2015-08-27 14:31:27 +00:00 |
|
Elliott Hughes
|
975ac959c3
|
am 8b73be0a: am 8f13dc42: (-s ours) am 6eb9aa62: am 6bf93400: Merge "adb: fix mkdirs / adb pull with relative paths, fix win32 issues"
* commit '8b73be0a86e74659ea6fef012625b73eefec3956':
|
2015-08-27 14:31:25 +00:00 |
|
Elliott Hughes
|
6afb8a1a7a
|
am 3d1653b9: am bc3c21b9: (-s ours) am c3766916: am 8c61e029: Merge "adb_test/libbase_test: win32: get some tests working"
* commit '3d1653b9d95a661a1d76b4b1793cca7206d29042':
|
2015-08-27 14:31:23 +00:00 |
|
Elliott Hughes
|
e15bde252d
|
am 8d02c097: am a121a81f: (-s ours) am 07522aae: am bb3b45d2: Merge "libbase_test: win32: get some tests working"
* commit '8d02c097c2b854592c0c284b2da9a06813286edd':
|
2015-08-27 14:31:22 +00:00 |
|
Tom Cherry
|
6169569fa8
|
am 380cc33f: am b6545bf5: (-s ours) am 0070026c: am 4247ebfd: Merge "init: use std::vector<std::string> for argument passing"
* commit '380cc33fb81954158322a3ddc54caa8d6926bbc9':
|
2015-08-27 14:31:20 +00:00 |
|
Todd Kennedy
|
4c8a8e74bf
|
am 2aee50f2: am 94927221: (-s ours) am 1f6204a8: am 6782ca0b: Merge "Add a trace constant for PackageManager"
* commit '2aee50f212e57b2e286df0fb7dc4645adbd1152e':
|
2015-08-27 14:31:19 +00:00 |
|
Elliott Hughes
|
616fd36e8c
|
am 93b57504: am 3f0a0142: (-s ours) am d2984900: am 11ca81fc: Merge "Remove adb\'s unused get_my_path for Windows."
* commit '93b575041d7b231d92ef9ad44aabca1ecfed6622':
|
2015-08-27 14:31:17 +00:00 |
|
Yabin Cui
|
b8d128209b
|
am 8f0daa52: am 2df4804a: (-s ours) am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection."
* commit '8f0daa520dfd4bc29c04cb85799abf8fd648bd7b':
|
2015-08-27 14:31:16 +00:00 |
|
Jorge Lucangeli Obes
|
a35aa3fb5f
|
am 23bac12e: am df01d12e: (-s ours) am 45ca3d54: am a336cbcd: Merge "Reserve new UID range for OEM."
* commit '23bac12e4b963d716b123ed9394898460f5c9235':
|
2015-08-27 14:31:14 +00:00 |
|
Elliott Hughes
|
fea86500df
|
am adf9165f: am 66429b34: (-s ours) am b8b71186: am 367fb503: Merge "adb: win32: Unicode path names, env vars, some console support"
* commit 'adf9165f44c0bc1d3d5ac30825ec18ace41779b3':
|
2015-08-27 14:31:12 +00:00 |
|
Yusuke Sato
|
7411d77288
|
am b1696f64: am 23ec3e46: (-s ours) am 2f9e1db3: am b5d6ad81: Merge "Stop calling fsck on shutdown by default"
* commit 'b1696f6436227f582a5139039e935c5215466747':
|
2015-08-27 14:31:11 +00:00 |
|
Lee Campbell
|
5998da2a0a
|
am 8c8f1639: am 7ff4bb7e: (-s ours) am 150c05fe: am 0f918878: Merge "init: Adding header guard to tokenizer"
* commit '8c8f16393b420ba2d0d52126cd9df2641f78aae2':
|
2015-08-27 14:31:09 +00:00 |
|
Elliott Hughes
|
5b213be5fd
|
am 9eb6530c: am 5e6d1dcf: (-s ours) am 3d561748: am ec035950: Merge "Clean up -p handling slightly."
* commit '9eb6530c80f304e58cbcd869a04ee213380fd482':
|
2015-08-27 14:31:07 +00:00 |
|
Elliott Hughes
|
6c5e3e02f0
|
am f552ddc0: am c0d738f3: (-s ours) am 6dca1987: am cf4dba5a: Merge "adb: win32: initial IPv6 support and improved Winsock error reporting"
* commit 'f552ddc01319d507c0cafafe0fb015ae85c07f27':
|
2015-08-27 14:31:06 +00:00 |
|
Yabin Cui
|
87ffce745f
|
am dad02d9e: am 739349cd: (-s ours) am a6fda917: am dc1fb361: Merge "Make clear of the data length sent by write_packet."
* commit 'dad02d9eef7ec5ef4a317f8820ea5bbb2157d058':
|
2015-08-27 14:31:03 +00:00 |
|
Elliott Hughes
|
c296d3c547
|
am e0dd7955: am e0b43a17: (-s ours) resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp
* commit 'e0dd7955cb47b012bc1225a55d268019f4b3482b':
|
2015-08-27 14:31:01 +00:00 |
|
Elliott Hughes
|
83915b58e8
|
am 5d238ddc: am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp
* commit '5d238ddc156ae061a8b69fa9c4141e76ae5d07b2':
|
2015-08-27 14:30:59 +00:00 |
|
Tom Cherry
|
eec81d4e2e
|
am 9b3b9002: am 97d393bb: (-s ours) am a21d8562: am d548e30f: Merge "init: Create classes for Action and Command"
* commit '9b3b9002de420ea13ac30ca2d4e9bc11a37be85d':
|
2015-08-27 14:30:57 +00:00 |
|
Andreas Gampe
|
3acfe0b6cd
|
am 6f93345b: am 2bcba6de: (-s ours) am 9773d945: am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning"
* commit '6f93345b199a3e4bedd31778102751d4dc923f49':
|
2015-08-27 14:30:56 +00:00 |
|
Lee Campbell
|
2b86b3516a
|
am 4ef88d5e: am 71585213: (-s ours) am 1691d968: am 138c540f: Merge "init: Add C++ tokenizer."
* commit '4ef88d5eb3065663db89962e6b4dbd8ea9a4d8b3':
|
2015-08-27 14:30:54 +00:00 |
|
Dan Albert
|
ffbf997739
|
am 629fb90a: am e12db0b2: (-s ours) am bec459a2: am 480bea33: Merge "Add top level sanitize options for ADB."
* commit '629fb90a76089c81711b0ff7737ba18168f29890':
|
2015-08-27 14:30:52 +00:00 |
|