Yabin Cui
|
cd159ba349
|
am 4edb97ab: (-s ours) am f03aa667: am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread."
* commit '4edb97abb71c1d45214e723ce2b82bff0208ee98':
|
2015-08-27 11:56:20 +00:00 |
|
Nick Kralevich
|
8955ae5af3
|
am 3192689b: (-s ours) am 63141512: am 53f11b62: Merge "libcutils: enable LOCAL_SANITIZE := integer"
* commit '3192689b2184660c4a896436d66406db24f9132d':
|
2015-08-27 11:56:17 +00:00 |
|
Nick Kralevich
|
ba8efa2a2f
|
am 78d632a0: (-s ours) am 38f4a139: am 532e6cde: Merge "libcutils: cleanups for -fsanitize=integer"
* commit '78d632a01de2231ef567cf9a6cf32f9895ceb716':
|
2015-08-27 11:56:15 +00:00 |
|
Mark Salyzyn
|
929a076052
|
am 86c8be04: (-s ours) am 0c3177c5: am 64393789: Merge "logd: worst uid record watermark part deux"
* commit '86c8be04433d178a6cada30dddeb2d31c7d5de7b':
|
2015-08-27 11:56:13 +00:00 |
|
Elliott Hughes
|
d6551839f4
|
am 8303f54a: (-s ours) am b6ae989a: am 0ac29519: Merge "Don\'t build 32-bit host libadb."
* commit '8303f54a588ba28fb519afe47c6c42d16ef83a2b':
|
2015-08-27 11:56:11 +00:00 |
|
Elliott Hughes
|
fbd87261ae
|
am 12e519cc: (-s ours) am 5e2e4fd5: am e2cda953: Merge "Fix missing <stdarg.h>."
* commit '12e519cc39c8d9594b9d96b7a799b47e0696af75':
|
2015-08-27 11:56:09 +00:00 |
|
Elliott Hughes
|
97e4d75407
|
am c32a4361: (-s ours) am f4603673: am 04b94b25: Merge "Use 64-bit file sizes in fastboot."
* commit 'c32a4361cc63b89d4e76c144ca7a1f52c999522d':
|
2015-08-27 11:56:08 +00:00 |
|
Elliott Hughes
|
bc8c227529
|
am 1533f95b: (-s ours) am 615af25f: am a421c1e5: Merge "Possible Mac build fix."
* commit '1533f95bbaf2a8895b05d146e578e47d8a69dadd':
|
2015-08-27 11:56:06 +00:00 |
|
Elliott Hughes
|
b3bdac729d
|
am 4f2015a1: (-s ours) am 9492db23: am 62643302: Merge "Not all filesystems support setting SELinux labels."
* commit '4f2015a155175f9da36574a378ce15ed74027ae9':
|
2015-08-27 11:56:04 +00:00 |
|
Ruchi Kandoi
|
6e845ef631
|
am 9e8eb993: (-s ours) am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties."
* commit '9e8eb9930b39638f7a7fff6b02a86906430cb76f':
|
2015-08-27 11:56:02 +00:00 |
|
Sergio Giro
|
377c094e60
|
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 '361d16e7079e4b6e1c27df3f8ccc98b67b74a62f':
|
2015-08-27 11:56:00 +00:00 |
|
Steve Fung
|
c24ead590e
|
am f079143b: (-s ours) am c734ac27: am c3d61786: Merge "crash_reporter: Run with supplemental groups"
* commit 'f079143b298ea050bcbbb8567e0c41ed89059c92':
|
2015-08-27 11:55:57 +00:00 |
|
Elliott Hughes
|
401b41a1a2
|
am 39206a08: (-s ours) am 1ce12d39: am 43f43d87: Merge "Move adb\'s selinux_android_restorecon up and check for failures."
* commit '39206a08d8780da3b15eddaf26918db2682b84b6':
|
2015-08-27 11:55:51 +00:00 |
|
Elliott Hughes
|
afae173360
|
am e4baae6d: (-s ours) am 12d762e1: am e8e272c5: Merge "EINTR is handled by adb_read/unix_read and friends."
* commit 'e4baae6d066c7d39af127a2ba1df5e91475db1a9':
|
2015-08-27 11:55:49 +00:00 |
|
Elliott Hughes
|
ceb0b50f97
|
am 9ccf4bfb: (-s ours) resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp
* commit '9ccf4bfbde288119e6e90f9ad58351a5d2c59ff9':
|
2015-08-27 11:55:46 +00:00 |
|
Elliott Hughes
|
d4d2f48fa7
|
am 9bc8005e: (-s ours) resolved conflicts for merge of 3ecba7f9 to mnc-dev-plus-aosp
* commit '9bc8005e079a1062751b5e9d62afeef3f2407dfb':
|
2015-08-27 11:55:44 +00:00 |
|
Elliott Hughes
|
b62af3eba8
|
am 478bca2e: (-s ours) resolved conflicts for merge of ba8fc829 to mnc-dev-plus-aosp
* commit '478bca2e728c108158fd68b469b3a48e2a432ad9':
|
2015-08-27 11:55:41 +00:00 |
|
Elliott Hughes
|
d70ddbc520
|
am 9c24c441: (-s ours) am e55e820e: am e13fd9aa: Merge "lsof fixes."
* commit '9c24c4410ce059c87f7dab9160442a340dbd2bbc':
|
2015-08-27 11:55:39 +00:00 |
|
Tom Cherry
|
e038b24c9d
|
am fbe3fa84: (-s ours) am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit 'fbe3fa84ff2564b909eaad4f427d4501bf5eb285':
|
2015-08-27 11:55:37 +00:00 |
|
Elliott Hughes
|
8545944dcf
|
am e3bbb2ab: (-s ours) am 6c04e9a9: am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows."
* commit 'e3bbb2ab00a117bf749d0c7e3072118276c89564':
|
2015-08-27 11:55:35 +00:00 |
|
Nick Kralevich
|
b1736207ff
|
am 2bcb9221: (-s ours) am 7ec4c228: am e80ec0c5: Merge "libutils: Enable LOCAL_SANITIZE := integer"
* commit '2bcb9221d492838c95f4eee3cb65589a3e789b09':
|
2015-08-27 11:55:33 +00:00 |
|
Elliott Hughes
|
6fca44cf22
|
am 201eaa68: (-s ours) am 5c027334: am 93b9e865: Merge "There are no big endian hosts, grandpa."
* commit '201eaa683a5edd79000110e5246353235bb42ab1':
|
2015-08-27 11:55:31 +00:00 |
|
Elliott Hughes
|
8327112798
|
am 6b5f77c9: (-s ours) am c583c511: am 186f1dee: Merge "adb sync cleanup."
* commit '6b5f77c9bb0923e0072651a52a500c8c10b4d32b':
|
2015-08-27 11:55:28 +00:00 |
|
Badhri Jagan Sridharan
|
d9928e9bce
|
am ff490354: (-s ours) am 46f24955: am e3c02883: Merge "adbd: enable USB SuperSpeed (again)"
* commit 'ff490354f495624578dc8feeab2c241f741f8a4b':
|
2015-08-27 11:55:18 +00:00 |
|
Nick Kralevich
|
b2a3e93353
|
am 50659902: (-s ours) am 4f0a7cb8: am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"
* commit '50659902d2df4d6fbc738b3c17ebc38d1060a140':
|
2015-08-27 11:55:16 +00:00 |
|
Siva Velusamy
|
2f9f50bb11
|
am ef39b261: (-s ours) am 5b476736: am 9498fc68: Merge "Use glog for logging in the OSX USB layer"
* commit 'ef39b2613c0f2b9a9c98c1f01c8f4bcc30c8d1ae':
|
2015-08-27 11:55:13 +00:00 |
|
Steve Fung
|
718439d294
|
am cb24dac2: (-s ours) am df564009: am f87f5f90: Merge "crash_reporter: Fix tmp directory location"
* commit 'cb24dac289a9cbcbfb61c67e22e60556270a4458':
|
2015-08-27 11:55:10 +00:00 |
|
Steve Fung
|
2a14727cac
|
am b39f02e4: (-s ours) am 7c6f3129: am ea1e07e9: Merge "crash_reporter: Relicense as Apache 2."
* commit 'b39f02e434a3390cf318b361901ab9880b7224fd':
|
2015-08-27 11:55:08 +00:00 |
|
Yusuke Sato
|
5db10d8e86
|
am ae0b28f5: (-s ours) am eaf04aa0: am 3b94cef1: Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"
* commit 'ae0b28f569411e66ba16e3ad69c1fda9199201ab':
|
2015-08-27 11:55:06 +00:00 |
|
Chih-hung Hsieh
|
f50702d77b
|
am de74335c: (-s ours) am f91d63e2: am 34d0e782: Merge "To compile with llvm integrated assembler."
* commit 'de74335cb2064aa2873f4de45f42394a5c721c58':
|
2015-08-27 11:55:04 +00:00 |
|
Steve Fung
|
96f8588f7f
|
am 2083a3be: (-s ours) am 975f8511: am 2e2dc003: Merge "crash_reporter: Fix path to dbus-send"
* commit '2083a3befce6718caab22f6010d925528190a068':
|
2015-08-27 11:55:02 +00:00 |
|
Steve Fung
|
f1d48975d9
|
am 7f3e8b65: (-s ours) am 916a5c86: am 0f6c07b7: Merge "crash_reporter: Add Android.mk"
* commit '7f3e8b6574cb58ca94fd08d566b17308166ff4d4':
|
2015-08-27 11:55:00 +00:00 |
|
Elliott Hughes
|
04be81366e
|
am 30baa479: (-s ours) Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dev-plus-aosp
* commit '30baa4796d02b137ac8a45c1657fc5514856bfd8':
update bundled rc files to their contents from rootdir/init.rc
|
2015-08-27 11:54:57 +00:00 |
|
Tom Cherry
|
4dda18586f
|
am 57a082f4: (-s ours) resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp
* commit '57a082f4de1864daf545e9f11f7373a409614326':
|
2015-08-27 11:54:55 +00:00 |
|
Tom Cherry
|
ef1c79ae30
|
am d64bf338: (-s ours) am 08a6775f: am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"
* commit 'd64bf33890687f97b7c04bb6398b366cf197d41f':
|
2015-08-27 11:54:53 +00:00 |
|
Tom Cherry
|
f3c12f4d7d
|
am 60eb73ed: (-s ours) am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'
* commit '60eb73ed6a537c79f57bf03f1c3c7ebd04f409ea':
|
2015-08-27 11:54:51 +00:00 |
|
Mark Salyzyn
|
ff7230a770
|
am 1695b846: (-s ours) am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string"
* commit '1695b8464dda219b717adfb40a95bd5e34cd4da3':
|
2015-08-27 11:54:49 +00:00 |
|
Mark Salyzyn
|
d9d21cb74c
|
am d52484c7: (-s ours) am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string"
* commit 'd52484c7aacc2154b120a5526f73c97c444509cc':
|
2015-08-27 11:54:47 +00:00 |
|
Mark Salyzyn
|
7b44fd5e73
|
am 36a590ab: (-s ours) am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string"
* commit '36a590ab365418773c61fef5ffbfec4e641449db':
|
2015-08-27 11:54:45 +00:00 |
|
Steve Fung
|
6a6bcc2ab9
|
am 8b9da2d4: (-s ours) am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions"
* commit '8b9da2d41a4756ecc942eaa715409aaa706f3228':
|
2015-08-27 11:54:43 +00:00 |
|
Mark Salyzyn
|
b4d2e89d63
|
am 14dbb332: (-s ours) am 64f4adba: am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer"
* commit '14dbb332dda9371417040ded03a890339548db02':
|
2015-08-27 11:54:41 +00:00 |
|
Abhishek Arya
|
98c17f96b2
|
am 64e2d8c0: (-s ours) am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
* commit '64e2d8c0dc2bbe3b61fc1fa3f66ae033be727b2b':
|
2015-08-27 11:54:39 +00:00 |
|
Sergio Giro
|
9f6eb2102f
|
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 'd1af60186bea73f93f776db5c2858f2ef5d76f13':
|
2015-08-27 11:54:37 +00:00 |
|
Christopher Ferris
|
f8c887fff1
|
am 8ec0ba64: (-s ours) am 0ee72c10: am 711e776c: Merge "Display the map offset for each frame."
* commit '8ec0ba64b9b3ffb48276b2ccc4b265b546393e4f':
|
2015-08-27 11:54:34 +00:00 |
|
Christopher Ferris
|
8e6187cd45
|
am 2d651eda: (-s ours) am e0ab2322: Display the map offset for each frame.
* commit '2d651eda49057ad837d4b8a96f3f0cf4e74d6d20':
|
2015-08-27 11:54:32 +00:00 |
|
Bertrand Simonnet
|
89b12ce77d
|
am d227679b: (-s ours) am 6b8fd10a: am 300b1a6b: Merge "metricsd: Don\'t crash when some metadata is missing."
* commit 'd227679b352e846d9f4f897585203475eb465e9a':
|
2015-08-27 11:54:30 +00:00 |
|
Bertrand Simonnet
|
c2ba04b90f
|
am 60413943: (-s ours) am 2888eec0: am 565d20ef: Merge "metricsd: Enable https by default."
* commit '604139432841da50906e0cd5247f0d261983d03d':
|
2015-08-27 11:54:28 +00:00 |
|
Mark Salyzyn
|
4dfd9c169a
|
am 982bbea0: (-s ours) am 2a04ec35: am 07ee12aa: Merge "logd: worst uid record watermark"
* commit '982bbea061918bd0146ceecf85daccfbcafea8e7':
|
2015-08-27 11:54:26 +00:00 |
|
Mark Salyzyn
|
e8d44c50c7
|
am 76cbf5f3: (-s ours) am 44a7da74: am 2c1b8f9e: Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4
* commit '76cbf5f37fc7f50b52edf40f563d197fb28f5244':
|
2015-08-27 11:54:24 +00:00 |
|
Elliott Hughes
|
fc9b1bb75e
|
am 425702fa: (-s ours) am 89b26e28: am e03d0322: Merge "fastboot should say which device it\'s waiting for."
* commit '425702fa23411dc99b52a3ab58b263e87f7fb624':
|
2015-08-27 11:54:22 +00:00 |
|