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 |
|
Siva Velusamy
|
4b3dce461c
|
am b3d3e245: (-s ours) am ba7284ae: am 4d40c03b: Merge "adb: On Mac, clear both host and device endpoints at startup"
* commit 'b3d3e245854ca498eadf8a6d7a3bc0b5f6cceeea':
|
2015-08-27 11:53:24 +00:00 |
|
Elliott Hughes
|
1374c48b1b
|
am bf449983: (-s ours) am e1c3a7c1: am 45288223: Merge "libbase: logging fixes"
* commit 'bf449983ce68a8eaa0c54ceac801edb32277a43c':
|
2015-08-27 11:53:19 +00:00 |
|
Nick Kralevich
|
3066591a5a
|
am 1deb0317: (-s ours) am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer""
* commit '1deb03179c635c33778815e2fab950aadeeb6600':
|
2015-08-27 11:53:11 +00:00 |
|
Elliott Hughes
|
bb640d5ff4
|
am f36aa8ec: (-s ours) am 5563b77a: am 57532b2a: Merge "adb: improve network error info"
* commit 'f36aa8ec5de6a254d2b2e3849d2d4d203a09ee9f':
|
2015-08-27 11:53:07 +00:00 |
|
Elliott Hughes
|
4ef7772843
|
am 5e60d25d: (-s ours) am 1685b099: am 8836031b: Merge "adb: win32: fix shutdown deadlock"
* commit '5e60d25d66caf6b4a7dbbfb3c33c61eecb6a93bf':
|
2015-08-27 11:53:04 +00:00 |
|
Elliott Hughes
|
840a4fe0c7
|
am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output"
* commit '56d11898aa6937df3d1342b7d99dca8813d162a4':
|
2015-08-27 11:52:56 +00:00 |
|
Riley Andrews
|
444f21d4cc
|
am 87ea6cfb: (-s ours) am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
* commit '87ea6cfb6219222fef991713aba21a739bf4f121':
|
2015-08-27 11:52:50 +00:00 |
|
Riley Andrews
|
bce559ec94
|
am c1490ad9: (-s ours) am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
* commit 'c1490ad9a00b34e13e60a3da056b441242449680':
|
2015-08-27 11:52:46 +00:00 |
|
David Pursell
|
8310fc5e72
|
am 6eef56fb: (-s ours) am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells."
* commit '6eef56fb7acf78728840210ac104da9cc0d06fc9':
|
2015-08-27 11:52:43 +00:00 |
|
Yabin Cui
|
b0e82aaf1e
|
am 63a29199: (-s ours) am 87f73de9: am 317acfb8: Merge "Remove confusing variable HOST."
* commit '63a29199f3192a66a1bf7a3127ba879fa7d51d9f':
|
2015-08-27 11:52:33 +00:00 |
|
Bertrand Simonnet
|
5cb8e7963b
|
am f236bdda: (-s ours) am 450ed3e8: am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files."
* commit 'f236bdda07f0b1984abc35dc667de77e2a1e9d14':
|
2015-08-27 11:52:28 +00:00 |
|
Bertrand Simonnet
|
a814ffe1b4
|
am 83399202: (-s ours) am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2."
* commit '833992023c18c61078fd68c6c2d6efba27656a8c':
|
2015-08-27 11:52:26 +00:00 |
|
Nick Kralevich
|
2eac901888
|
am 864d4985: (-s ours) am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer"
* commit '864d4985ed0434974b8d0401dc9c670d186d594a':
|
2015-08-27 11:52:23 +00:00 |
|
Elliott Hughes
|
9c43d4d79f
|
am efc80772: (-s ours) am c01231b3: am 2fb00423: Merge "Always include the adb version in the log."
* commit 'efc8077246a3e816957a774f3d272b909c1c1b12':
|
2015-08-27 11:52:19 +00:00 |
|
Elliott Hughes
|
7d5c9eaef8
|
am f000f7b2: (-s ours) am 70af6e0b: am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal"
* commit 'f000f7b25074f75995477ac72ea2b0a749b87b05':
|
2015-08-27 11:52:16 +00:00 |
|
Mark Salyzyn
|
090b153185
|
am 1763d1aa: (-s ours) am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"
* commit '1763d1aa786ad4df97eeeb0c1fc482b8b29eb2de':
|
2015-08-27 11:52:14 +00:00 |
|