Elliott Hughes
|
ef2fc23769
|
am 92a3d2ba: (-s ours) am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."
* commit '92a3d2ba32cbfcd329630cc1b2e4787bf4496048':
|
2015-08-27 11:49:14 +00:00 |
|
Bertrand Simonnet
|
e3c9a037e7
|
am 4c041f55: (-s ours) am da65eee8: am 05b9edc2: Merge "crash_reporter: Add license information."
* commit '4c041f55a32c8b6835f9e818541ab8bbd0ece929':
|
2015-08-27 11:49:11 +00:00 |
|
Bertrand Simonnet
|
e83393eddb
|
am 6675db39: (-s ours) am ddbbc6d2: am 75ecc74a: Merge "metrics: Add license information."
* commit '6675db397e7fdfc6232d899762f196abf24e94a6':
|
2015-08-27 11:49:06 +00:00 |
|
Jeff Sharkey
|
eb774e2991
|
am e0176199: (-s ours) am d57125af: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit 'e01761998bd37af0d78131d137a79a07d8cdd2ae':
|
2015-08-27 11:49:01 +00:00 |
|
Dan Albert
|
6280d46475
|
am dee79f85: (-s ours) am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests."
* commit 'dee79f85b6c1a359bba1470864dd32a636e5c13b':
|
2015-08-27 11:48:56 +00:00 |
|
Elliott Hughes
|
d025d206fe
|
am b6bfa337: (-s ours) am 07bed194: am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE."
* commit 'b6bfa337e58c0554e6b853ce64eb3fb33a5e16a7':
|
2015-08-27 11:48:49 +00:00 |
|
Elliott Hughes
|
0df0e17763
|
am edb90efc: (-s ours) am 0adda0d5: am 524551fd: Merge "Document the current MAX_USBFS_BULK_SIZE situation."
* commit 'edb90efc1cd0a9ed8c9645ffb3722e70d41a13f4':
|
2015-08-27 11:48:35 +00:00 |
|
Elliott Hughes
|
12a9c9058e
|
am 24419f3c: (-s ours) am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers."
* commit '24419f3c2e5b821e8f3efcfef32c9d530f0bd0d9':
|
2015-08-27 11:48:26 +00:00 |
|
Tao Bao
|
b6e9fb0606
|
am 5c151c4a: (-s ours) am beb13044: am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img."
* commit '5c151c4a4b8c9e6aa0d9dd06eedebc7277963a13':
|
2015-08-27 11:48:13 +00:00 |
|
Jeffrey Vander Stoep
|
2842bdc07c
|
am 6beb774d: (-s ours) am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
* commit '6beb774d5e1606a2a1791c3d165cdecb4fb62b36':
|
2015-08-27 11:48:00 +00:00 |
|
Mark Salyzyn
|
e7057a6e77
|
am 6e629e46: (-s ours) am f2e86153: am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9
* commit '6e629e46a1c284219386df7e97adafbdbd13432e':
|
2015-08-27 11:47:51 +00:00 |
|
Bill Yi
|
a4d8266e19
|
am 49fc21c6: (-s ours) am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics
* commit '49fc21c60e5e791b3fa1794675ba9435ded23e73':
|
2015-08-27 11:47:33 +00:00 |
|
Bill Yi
|
5e223d8f36
|
am d981388e: (-s ours) am db639251: am 5cab5290: Merge branch \'rewrite-crash-reporter\' into merge-crash-reporter
* commit 'd981388e2ba8ddaf572f9d23ae669203b6543e55':
|
2015-08-27 11:47:18 +00:00 |
|
Andreas Gampe
|
394c81c8bd
|
am 18f8bb5f: (-s ours) am 1bc7ac07: am a5b6715c: Merge "Adf: Remove unused variable"
* commit '18f8bb5f19140eb1029e6646b84c9034c12db166':
|
2015-08-27 11:47:10 +00:00 |
|
Elliott Hughes
|
ce21e4c2a3
|
am c6c02ecd: (-s ours) am 4cfbf781: am bb9fcb1e: Merge "Remove gpttool."
* commit 'c6c02ecd2a243ec43b92fde36f2ed1cddafe755b':
|
2015-08-27 11:46:56 +00:00 |
|
Erik Kline
|
6d080d48cd
|
am a7720ca1: (-s ours) am cc451785: Fix incorrectly sized buffer.
* commit 'a7720ca1f905d8fcd76e51ac579d397f899ab4dd':
|
2015-08-27 11:46:48 +00:00 |
|
Lee Campbell
|
cc2b8022cc
|
am 42f669a1: (-s ours) am f75b5ff1: am fe39394e: Merge "init: Adding support to import directories"
* commit '42f669a144e2b92ff7473f802af66cd65dfd2a68':
|
2015-08-27 11:46:35 +00:00 |
|
Dan Albert
|
4681d1fd9e
|
am 0566ab6f: (-s ours) am 05432f07: am 20cf8702: Merge "Create adb Python package."
* commit '0566ab6fed582affad0f6e303f16b3e1ca18e66b':
|
2015-08-27 11:46:29 +00:00 |
|
Andreas Gampe
|
e877069b57
|
am ba6def68: (-s ours) am 0c61a650: am 2e132ef6: Merge "Logd: Handle unused variable and fields"
* commit 'ba6def68054a2e7f61ed803a797dfe47697be435':
|
2015-08-27 11:46:17 +00:00 |
|
Nick Kralevich
|
7599f4c015
|
am 0f42f393: (-s ours) am ba03cc95: am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system"
* commit '0f42f3937126a6de329406216b1bac73da79ef35':
|
2015-08-27 11:46:11 +00:00 |
|
Elliott Hughes
|
9d33b7773f
|
am 8a8953bb: (-s ours) Fix libcutils build.
* commit '8a8953bb3dcad58c560e4c6247b7897a2a6122d1':
Fix libcutils build.
|
2015-08-27 11:46:05 +00:00 |
|
Elliott Hughes
|
51e69ca124
|
am 3dced0d2: (-s ours) am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check."
* commit '3dced0d2c6000d1d77fd2ada83a9853734367cbc':
|
2015-08-27 11:45:51 +00:00 |
|
Elliott Hughes
|
d2d83da4e4
|
am 8b262b9d: (-s ours) resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp
* commit '8b262b9de4defd234ec3593453bfb1dba4642151':
|
2015-08-27 11:45:41 +00:00 |
|
Yabin Cui
|
92e245e8f6
|
am a6d23bd6: (-s ours) am 10821da3: am 8a502000: Merge "init: expand_props for onrestart commands."
* commit 'a6d23bd6d2c31c1de69a97d78ab1e557bedcc04a':
|
2015-08-27 11:45:31 +00:00 |
|
Yabin Cui
|
0a963c8486
|
am 57eb040b: (-s ours) am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins."
* commit '57eb040ba94a4bd415ff5a71901643332dad493b':
|
2015-08-27 11:45:22 +00:00 |
|
Elliott Hughes
|
21d1aa1061
|
am 5bd3c3bb: (-s ours) am b8fa711f: am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."
* commit '5bd3c3bb5435e2b7cfe521875776a11ddfe3cabd':
|
2015-08-27 11:45:13 +00:00 |
|
Jeff Vander Stoep
|
941c6e78f5
|
am c200e956: (-s ours) am 3f62a020: logd: allow logd to write to /dev/cpuset files
* commit 'c200e9564b3ec7eea4b55badbeb0882c9674513d':
|
2015-08-27 11:44:55 +00:00 |
|
Elliott Hughes
|
d0c94f5bab
|
am 187afaf5: (-s ours) am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit '187afaf54f76f4a4a2598de7c66f8ecf32c0ee2a':
|
2015-08-27 11:44:46 +00:00 |
|
Elliott Hughes
|
c14a92c1fc
|
am 994e9ea7: (-s ours) am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit '994e9ea787dbfa584f83b77a0c49277351c7113b':
|
2015-08-27 11:44:29 +00:00 |
|
Elliott Hughes
|
674641eba4
|
am 4bc35f3e: (-s ours) am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build."
* commit '4bc35f3e4ce5ec94f70bed6ac78cbc8ea186448f':
|
2015-08-27 11:44:12 +00:00 |
|
Yabin Cui
|
5f1b750de9
|
am 62b3f91d: (-s ours) am bff40697: am addf7a96: Merge "init: Let property_get return std::string."
* commit '62b3f91d142e8c0b698729d3d7f3f4a9b8924c2f':
|
2015-08-27 11:43:58 +00:00 |
|
Elliott Hughes
|
fa6cfef507
|
am 5937a860: (-s ours) am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly."
* commit '5937a860f3ad87138956116b9cb0ffbac703c547':
|
2015-08-27 11:43:46 +00:00 |
|
Elliott Hughes
|
ebac99cfc1
|
am b877d72a: (-s ours) am f5defe75: am 89cc750e: Merge "Don\'t limit Windows USB reads."
* commit 'b877d72a86b949078eb8dbdb3442d2e2eda5c4f8':
|
2015-08-27 11:43:34 +00:00 |
|
Elliott Hughes
|
86598d1380
|
am d704ede3: (-s ours) am 2fc8a91e: am 6b40d0aa: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
* commit 'd704ede39253c1b28900c54b57f7dc57cb0367e8':
|
2015-08-27 11:43:17 +00:00 |
|
Elliott Hughes
|
431ef0a73c
|
am ae18667f: (-s ours) am d804c6cd: am 571c8d71: Merge "Increase size of the the adb packets sent over the wire"
* commit 'ae18667f9423dcd92c0d2f00e8496b4d2d370167':
|
2015-08-27 11:43:10 +00:00 |
|
Elliott Hughes
|
16ec2e6613
|
am dd7fb9af: (-s ours) am 7f12fa27: am f5b46079: Merge "init: use init\'s property expansion code for mount_all"
* commit 'dd7fb9af1f1be158b900d1b0571a8a238ed6eed5':
|
2015-08-27 11:42:54 +00:00 |
|
Mark Salyzyn
|
96a9ae4c5e
|
am 736c238b: (-s ours) am deee35d7: am 3f1d7ebb: Merge "logd: refine is_prio"
* commit '736c238b8f526ae9c53364bd6141d415d903185e':
|
2015-08-27 11:42:47 +00:00 |
|
Elliott Hughes
|
ef11e8f91e
|
am bd83f19f: (-s ours) am 32b4d786: am a5d0ca4f: Merge "Show "(reverse)" in "adb reverse --list"."
* commit 'bd83f19f687f8000537ff884280a504cd643d049':
|
2015-08-27 11:42:40 +00:00 |
|
Mark Salyzyn
|
0381c9264e
|
am 3542f3da: (-s ours) am 7b0bb824: am 93adb524: Merge "init: Fix logging stutter"
* commit '3542f3dafae3d9bed5fecb09281726d09d4b13f9':
|
2015-08-27 11:42:32 +00:00 |
|
Mark Salyzyn
|
d9306b5de2
|
am f6aaed80: (-s ours) am 18fc744f: am 6743dab5: Merge "init: Add additional logging levels"
* commit 'f6aaed8020ed4d7df3211ce9c0a4e2dd0bc6972d':
|
2015-08-27 11:42:14 +00:00 |
|
Elliott Hughes
|
2ae7d6c16c
|
am fee06481: (-s ours) am d66e949b: am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument."
* commit 'fee06481213be7c2c5ba772bc45e56baa7802a95':
|
2015-08-27 11:42:04 +00:00 |
|
Elliott Hughes
|
267385378e
|
am c83614a8: (-s ours) am 59ae3947: am 3bcdaa28: Merge "Recognize IPv6 addresses for "adb connect"."
* commit 'c83614a8a5e3864ad423415fa76a3a503a92f337':
|
2015-08-27 11:41:51 +00:00 |
|
Elliott Hughes
|
8a8ae43b08
|
am cc07811e: (-s ours) am 3cd33a72: am 5208d551: Merge "adb: logging: newlines, thread ids, error code overwriting"
* commit 'cc07811ebb4f42109ae9ef1414e1a24d8cf54a9d':
|
2015-08-27 11:41:41 +00:00 |
|
Yusuke Sato
|
ed39479f0c
|
am 7c842b57: (-s ours) am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot"
* commit '7c842b57fe5b81802b35b5de1572956981a7ea22':
|
2015-08-27 11:41:22 +00:00 |
|
Elliott Hughes
|
c8e195d672
|
am ac6a325e: (-s ours) am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST."
* commit 'ac6a325e5c2e2c852d4a5375743f17a29a372df9':
|
2015-08-27 11:41:11 +00:00 |
|
Daniel Rosenberg
|
57b3c85134
|
am d2bb8134: (-s ours) am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk"
* commit 'd2bb8134d337d35c6abfcf57a8a6c754fdba9d45':
|
2015-08-27 11:40:56 +00:00 |
|
Elliott Hughes
|
68b452b9ef
|
am 0f9b94e2: (-s ours) am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."
* commit '0f9b94e21d6db64abaf026e84b544d32364f99bf':
|
2015-08-27 11:40:45 +00:00 |
|
Daniel Erat
|
430e86ca94
|
am cca5c3f1: (-s ours) am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit 'cca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa':
|
2015-08-27 11:40:34 +00:00 |
|
Elliott Hughes
|
9ecbf3b8f9
|
am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build."
* commit '32cfa9527136665689818399771174b5e25d32ba':
|
2015-08-27 11:40:25 +00:00 |
|
Elliott Hughes
|
94ee3eab00
|
am 546738a4: (-s ours) am 6657d224: am 069f62de: Merge "Fix N9 boot."
* commit '546738a4e7afbb216876cf65791c87adb0541e7d':
|
2015-08-27 11:40:07 +00:00 |
|