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 |
|
Elliott Hughes
|
6a90d9b3ee
|
am 338c8669: (-s ours) am 2a2c2036: am e728eb91: Merge "Get fastboot working on OS X"
* commit '338c8669f7cab1823ab3bea60c2ba9549cdfeb9f':
|
2015-08-27 11:54:20 +00:00 |
|
Daniel Erat
|
28a49acd40
|
am f10e1ed1: (-s ours) am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__."
* commit 'f10e1ed1b2229700df0cc31cf7c8fb67a1ecbd55':
|
2015-08-27 11:54:18 +00:00 |
|
Steve Fung
|
05b2208370
|
am 61c677c8: (-s ours) am cbc6b915: am d4555689: Merge "crash_reporter: Enable core dumps"
* commit '61c677c8ca18da641772edd37d30049c83aca58a':
|
2015-08-27 11:54:16 +00:00 |
|
Bertrand Simonnet
|
78107c5584
|
am 6905b112: (-s ours) am cb1e29a9: am 0172dea6: Merge "metrics: Add init script for metrics_daemon."
* commit '6905b11291394a038fd30ba1b00c16f13dba2858':
|
2015-08-27 11:54:14 +00:00 |
|
Yusuke Sato
|
aee7db8152
|
am 2ef82cff: (-s ours) am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"
* commit '2ef82cffad897bc16dc1bde1763bf99875da6cbb':
|
2015-08-27 11:54:12 +00:00 |
|
Elliott Hughes
|
ac3836b52d
|
am 22b510ad: (-s ours) am 2b0deb91: am a169f3b4: Merge "adb: win32: fix unittest exit code parsing"
* commit '22b510adc53787e580c591f27613ce0a7f7e7c29':
|
2015-08-27 11:54:10 +00:00 |
|
Elliott Hughes
|
ef98e58e9e
|
am 6cec026e: (-s ours) am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
* commit '6cec026e86c4f243bb3149e44546a41006e817d6':
|
2015-08-27 11:54:07 +00:00 |
|
Sergio Giro
|
855c0fb07b
|
am 4d8c1d22: (-s ours) am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"
* commit '4d8c1d22231fadc190f7af9febfd2ba2cad0acf8':
|
2015-08-27 11:54:05 +00:00 |
|
Sergio Giro
|
3730f8beff
|
am ba71601a: (-s ours) am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
* commit 'ba71601aacb3846d7c83cfc89fff689e1b774c54':
|
2015-08-27 11:54:02 +00:00 |
|
Yusuke Sato
|
9ca83e3484
|
am 8e9a1ae5: (-s ours) am 885400fd: am 4d09db9d: Merge "perfboot.py: Add --end-tag option"
* commit '8e9a1ae5936d2bfae23dc0f7414a68973a894209':
|
2015-08-27 11:53:59 +00:00 |
|
Nick Kralevich
|
39411ec9be
|
am eec5baa0: (-s ours) am 77b9868a: am 6d814037: Merge "libutils: fix signed/unsigned comparison warnings"
* commit 'eec5baa0f71d2130eb8b383f9ecbb82d9e171fd0':
|
2015-08-27 11:53:56 +00:00 |
|
Elliott Hughes
|
73d7e78029
|
am 8528d9cf: (-s ours) am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."
* commit '8528d9cfb4ee36c0ffe30b15729873211240e449':
|
2015-08-27 11:53:54 +00:00 |
|
Evgenii Stepanov
|
54d5e92073
|
am 6c74e545: (-s ours) am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '6c74e5454456e7652b80fb6d19292a7a8948123c':
|
2015-08-27 11:53:51 +00:00 |
|
Nick Kralevich
|
df12dfbb0c
|
am d717f86a: (-s ours) am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"
* commit 'd717f86a3ed9bf0878ce67c176755f656cec29c2':
|
2015-08-27 11:53:48 +00:00 |
|
Elliott Hughes
|
16e493e213
|
am 92c1a372: (-s ours) am 5abbd967: am 94a845d9: Merge "Lose ionice and renice to toybox."
* commit '92c1a372341e7da3ac384b0f42b00dabf7a95141':
|
2015-08-27 11:53:43 +00:00 |
|
David Pursell
|
d51ffa0444
|
am f3f5bce2: (-s ours) am 6a701bd9: am b53b521e: Merge "Add adb features."
* commit 'f3f5bce204d264970dcc91b8f0a4149174b4add6':
|
2015-08-27 11:53:38 +00:00 |
|
David Pursell
|
8056ed538f
|
am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner."
* commit 'f53c7af1563dae58d19f1c59fe4a57ab3171e5af':
|
2015-08-27 11:53:34 +00:00 |
|
Elliott Hughes
|
b97fded212
|
am 2733c142: (-s ours) am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1."
* commit '2733c142320acc4eca724f6c4526f096ae34b929':
|
2015-08-27 11:53:31 +00:00 |
|
Elliott Hughes
|
bd363c41f3
|
am 60f9026e: (-s ours) am b4aa1777: am 782daf89: Merge "Fix the Mac libbase build."
* commit '60f9026e4e9cc137458f51a4f6a63ca0bedf2fa6':
|
2015-08-27 11:53:28 +00:00 |
|