Elliott Hughes
|
455ce99df1
|
am bc8c2275: am 1533f95b: (-s ours) am 615af25f: am a421c1e5: Merge "Possible Mac build fix."
* commit 'bc8c227529796216e78fc6d4fe1ebff1a07b2381':
|
2015-08-27 14:38:44 +00:00 |
|
Elliott Hughes
|
46d56f9f70
|
am b3bdac72: am 4f2015a1: (-s ours) am 9492db23: am 62643302: Merge "Not all filesystems support setting SELinux labels."
* commit 'b3bdac729d70a40b31fb06a7dbcaf77ce5e1012b':
|
2015-08-27 14:38:42 +00:00 |
|
Ruchi Kandoi
|
0a169ffd96
|
am 6e845ef6: am 9e8eb993: (-s ours) am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties."
* commit '6e845ef631aa42eed2e8268466dfc260c1ed4c4d':
|
2015-08-27 14:38:40 +00:00 |
|
Sergio Giro
|
bcd4793abc
|
am 377c094e: (-s ours) am 361d16e7: (-s ours) am 09a474ac: am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
* commit '377c094e608938f01b78d506164986db82b5065c':
|
2015-08-27 14:38:38 +00:00 |
|
Steve Fung
|
ef0fa05043
|
am c24ead59: am f079143b: (-s ours) am c734ac27: am c3d61786: Merge "crash_reporter: Run with supplemental groups"
* commit 'c24ead590ea9727697b49516569aaff76673c55b':
|
2015-08-27 14:38:36 +00:00 |
|
Elliott Hughes
|
6eb6c25b86
|
am 401b41a1: am 39206a08: (-s ours) am 1ce12d39: am 43f43d87: Merge "Move adb\'s selinux_android_restorecon up and check for failures."
* commit '401b41a1a2e5cfd8b0193cab98fa6dfc7d368923':
|
2015-08-27 14:38:34 +00:00 |
|
Elliott Hughes
|
935b02510d
|
am afae1733: am e4baae6d: (-s ours) am 12d762e1: am e8e272c5: Merge "EINTR is handled by adb_read/unix_read and friends."
* commit 'afae173360f288f84a64a0e5796f288e0d9afe9b':
|
2015-08-27 14:38:31 +00:00 |
|
Elliott Hughes
|
77451d3bdf
|
am ceb0b50f: am 9ccf4bfb: (-s ours) resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp
* commit 'ceb0b50f974da07872fec78c4151e6a3cab7abb7':
|
2015-08-27 14:38:28 +00:00 |
|
Elliott Hughes
|
0716b66f0e
|
am d4d2f48f: am 9bc8005e: (-s ours) resolved conflicts for merge of 3ecba7f9 to mnc-dev-plus-aosp
* commit 'd4d2f48fa78505f504b5cdf73b61dbdcc2e5bfc9':
|
2015-08-27 14:38:21 +00:00 |
|
Elliott Hughes
|
6cf8c25b57
|
am b62af3eb: am 478bca2e: (-s ours) resolved conflicts for merge of ba8fc829 to mnc-dev-plus-aosp
* commit 'b62af3eba81f9a1ed49f8b218a4851012df962f3':
|
2015-08-27 14:38:19 +00:00 |
|
Elliott Hughes
|
7e834e3e0f
|
am d70ddbc5: am 9c24c441: (-s ours) am e55e820e: am e13fd9aa: Merge "lsof fixes."
* commit 'd70ddbc520c31989ba60c7f834b35b1f4d96ddb6':
|
2015-08-27 14:38:16 +00:00 |
|
Tom Cherry
|
33ea3b0b23
|
am e038b24c: am fbe3fa84: (-s ours) am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit 'e038b24c9d4acbd6d11f241fad42a05050d23878':
|
2015-08-27 14:38:13 +00:00 |
|
Elliott Hughes
|
14384e3051
|
am 8545944d: am e3bbb2ab: (-s ours) am 6c04e9a9: am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows."
* commit '8545944dcf35240e760e02131c2ff2a5d8dc511e':
|
2015-08-27 14:38:11 +00:00 |
|
Nick Kralevich
|
5c65745ac7
|
am b1736207: am 2bcb9221: (-s ours) am 7ec4c228: am e80ec0c5: Merge "libutils: Enable LOCAL_SANITIZE := integer"
* commit 'b1736207ffd538be47662eba7d079666637b6c25':
|
2015-08-27 14:38:08 +00:00 |
|
Elliott Hughes
|
c86e9d325a
|
am 6fca44cf: am 201eaa68: (-s ours) am 5c027334: am 93b9e865: Merge "There are no big endian hosts, grandpa."
* commit '6fca44cf221e9b33ea0f40d86d387af1a0269e74':
|
2015-08-27 14:38:06 +00:00 |
|
Elliott Hughes
|
91f42226a9
|
am 83271127: am 6b5f77c9: (-s ours) am c583c511: am 186f1dee: Merge "adb sync cleanup."
* commit '83271127984e7f9006aed542e8d05f20dc63c4a3':
|
2015-08-27 14:37:59 +00:00 |
|
Badhri Jagan Sridharan
|
96386bbcd9
|
am d9928e9b: am ff490354: (-s ours) am 46f24955: am e3c02883: Merge "adbd: enable USB SuperSpeed (again)"
* commit 'd9928e9bcec89552f0755b664c01726c13f5d3a2':
|
2015-08-27 14:37:55 +00:00 |
|
Nick Kralevich
|
cdc48c0a85
|
am b2a3e933: am 50659902: (-s ours) am 4f0a7cb8: am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"
* commit 'b2a3e93353cd9b751647b868b1af3a84a560c7ed':
|
2015-08-27 14:37:52 +00:00 |
|
Siva Velusamy
|
8c2a1105ef
|
am 2f9f50bb: am ef39b261: (-s ours) am 5b476736: am 9498fc68: Merge "Use glog for logging in the OSX USB layer"
* commit '2f9f50bb117259baf9aabae61106e2bf45e13e9b':
|
2015-08-27 14:37:49 +00:00 |
|
Steve Fung
|
e5d6780f95
|
am 718439d2: am cb24dac2: (-s ours) am df564009: am f87f5f90: Merge "crash_reporter: Fix tmp directory location"
* commit '718439d29459472aec4853afd04cbc23db2ac618':
|
2015-08-27 14:37:47 +00:00 |
|
Steve Fung
|
7c1dca3a56
|
am 2a14727c: am b39f02e4: (-s ours) am 7c6f3129: am ea1e07e9: Merge "crash_reporter: Relicense as Apache 2."
* commit '2a14727cac8bfbd24f353030ff72a1cd550ab059':
|
2015-08-27 14:37:44 +00:00 |
|
Yusuke Sato
|
fd4c3a74fc
|
am 5db10d8e: am ae0b28f5: (-s ours) am eaf04aa0: am 3b94cef1: Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"
* commit '5db10d8e86d8d63b8e45af9c14f89a7074af1e60':
|
2015-08-27 14:37:42 +00:00 |
|
Chih-hung Hsieh
|
4487ffc6ec
|
am f50702d7: am de74335c: (-s ours) am f91d63e2: am 34d0e782: Merge "To compile with llvm integrated assembler."
* commit 'f50702d77b082de7175261ecc94b43ae469235ac':
|
2015-08-27 14:37:39 +00:00 |
|
Steve Fung
|
a4654cdbd9
|
am 96f8588f: am 2083a3be: (-s ours) am 975f8511: am 2e2dc003: Merge "crash_reporter: Fix path to dbus-send"
* commit '96f8588f7f161bf922fab507e16693daaaff669f':
|
2015-08-27 14:37:36 +00:00 |
|
Steve Fung
|
2fa86261a1
|
am f1d48975: am 7f3e8b65: (-s ours) am 916a5c86: am 0f6c07b7: Merge "crash_reporter: Add Android.mk"
* commit 'f1d48975d97af43e973af50fffa2a5898a862fc4':
|
2015-08-27 14:37:31 +00:00 |
|
Elliott Hughes
|
c8765e6e75
|
am 04be8136: am 30baa479: (-s ours) Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dev-plus-aosp
* commit '04be81366eb441af36017a77b28e4ab65114e88d':
update bundled rc files to their contents from rootdir/init.rc
|
2015-08-27 14:37:23 +00:00 |
|
Tom Cherry
|
d1a0bf303c
|
am 4dda1858: am 57a082f4: (-s ours) resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp
* commit '4dda18586fd85cfea90b61cc69a3d964c1b3cdde':
|
2015-08-27 14:37:20 +00:00 |
|
Tom Cherry
|
dbc37c67d9
|
am ef1c79ae: am d64bf338: (-s ours) am 08a6775f: am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"
* commit 'ef1c79ae30b737d92008be8df0a970dc9a6842c5':
|
2015-08-27 14:37:18 +00:00 |
|
Tom Cherry
|
d85a9a3838
|
am f3c12f4d: am 60eb73ed: (-s ours) am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'
* commit 'f3c12f4d7d0e3ebb508fe647c5901ca609f951be':
|
2015-08-27 14:37:15 +00:00 |
|
Mark Salyzyn
|
c67f13937e
|
am ff7230a7: am 1695b846: (-s ours) am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string"
* commit 'ff7230a770de55a9431a7298c7687678f1187c23':
|
2015-08-27 14:37:13 +00:00 |
|
Mark Salyzyn
|
60ef4a12b5
|
am d9d21cb7: am d52484c7: (-s ours) am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string"
* commit 'd9d21cb74ccc54276d59201848458daf0200fd1f':
|
2015-08-27 14:37:11 +00:00 |
|
Mark Salyzyn
|
0a151ce015
|
am 7b44fd5e: am 36a590ab: (-s ours) am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string"
* commit '7b44fd5e7321473f8a7d3200683c2386395649ea':
|
2015-08-27 14:37:08 +00:00 |
|
Steve Fung
|
173cdc4e74
|
am 6a6bcc2a: am 8b9da2d4: (-s ours) am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions"
* commit '6a6bcc2ab999208e32527b3c0dd5ac343b31abbf':
|
2015-08-27 14:37:06 +00:00 |
|
Mark Salyzyn
|
8c11423e4b
|
am b4d2e89d: am 14dbb332: (-s ours) am 64f4adba: am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer"
* commit 'b4d2e89d630d5b382f706f77a8b2033184031dc1':
|
2015-08-27 14:37:04 +00:00 |
|
Abhishek Arya
|
db565655de
|
am 98c17f96: am 64e2d8c0: (-s ours) am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
* commit '98c17f96b263c8694218f8b3f8a60bfd1c5d02ee':
|
2015-08-27 14:37:01 +00:00 |
|
Sergio Giro
|
3320bfba52
|
am 9f6eb210: am d1af6018: (-s ours) am 3fa8b550: am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
* commit '9f6eb2102f28887458b07f1b2ecf821698e3027b':
|
2015-08-27 14:36:59 +00:00 |
|
Christopher Ferris
|
f30dee2c87
|
am f8c887ff: am 8ec0ba64: (-s ours) am 0ee72c10: am 711e776c: Merge "Display the map offset for each frame."
* commit 'f8c887fff1adbb9367e8ef8860a8ab9517011aee':
|
2015-08-27 14:36:57 +00:00 |
|
Christopher Ferris
|
811ca563ce
|
am 8e6187cd: am 2d651eda: (-s ours) am e0ab2322: Display the map offset for each frame.
* commit '8e6187cd458cf30dbf8343a252eed1f2c55b83c1':
|
2015-08-27 14:36:55 +00:00 |
|
Bertrand Simonnet
|
51e9771e8b
|
am 89b12ce7: am d227679b: (-s ours) am 6b8fd10a: am 300b1a6b: Merge "metricsd: Don\'t crash when some metadata is missing."
* commit '89b12ce77d162d62ae6fe4527fcd2e01ee2e6e33':
|
2015-08-27 14:36:53 +00:00 |
|
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 |
|