summaryrefslogtreecommitdiffstats
path: root/toolbox
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of cb8c583d to stage-aosp-masterDmitriy Ivanov2014-11-031-1/+1
|\
| * Fix ps <process name>Dmitriy Ivanov2014-11-031-1/+1
* | am 8218b6aa: newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-101-1/+3
|\ \
| * | newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-101-1/+3
| * | Refresh toolbox.Elliott Hughes2014-07-2550-2089/+5901
| * | Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGESreeram Ramachandran2014-07-222-0/+2
| * | Switch to NetBSD's kill(1).Elliott Hughes2014-07-223-154/+272
| * | Fix cp(1) for files in /proc.Elliott Hughes2014-07-222-12/+12
* | | am f7c287b7: am 47d24416: Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
|\ \ \ | | |/ | |/|
| * | Fix top for very large VSS.Elliott Hughes2014-10-081-17/+30
* | | am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."Elliott Hughes2014-10-061-1/+1
|\ \ \ | |/ /
| * | Fix a typo in ioctl usage message.Elliott Hughes2014-10-061-1/+1
* | | am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now."Elliott Hughes2014-09-241-3/+0
|\ \ \ | |/ /
| * | bionic has O_RSYNC now.Elliott Hughes2014-09-231-3/+0
* | | am 61b4b809: am d1d11fcb: Merge "Build the optional \'r\' tool separately."Elliott Hughes2014-08-292-5/+11
|\ \ \ | |/ /
| * | Build the optional 'r' tool separately.Elliott Hughes2014-08-282-5/+11
* | | am 619765d7: am 31e29dbe: Merge "Remove duplication from sendevent.c."Elliott Hughes2014-08-261-42/+4
|\ \ \ | |/ /
| * | Remove duplication from sendevent.c.Elliott Hughes2014-08-251-42/+4
* | | am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)."Elliott Hughes2014-08-243-2/+109
|\ \ \ | |/ /
| * | Add BSD false(1) and true(1).Elliott Hughes2014-08-223-2/+109
* | | am 70b5cb79: am c9343cfe: Merge "Refresh toolbox."Elliott Hughes2014-07-2550-2089/+5901
|\ \ \ | |/ /
| * | Refresh toolbox.Elliott Hughes2014-07-2450-2089/+5901
* | | am 04857219: am 2fd1fec6: Merge "Switch to NetBSD\'s kill(1)."Elliott Hughes2014-07-223-154/+272
|\ \ \ | |/ /
| * | Merge "Switch to NetBSD's kill(1)."Elliott Hughes2014-07-223-154/+272
| |\ \
| | * | Switch to NetBSD's kill(1).Elliott Hughes2014-07-223-154/+272
* | | | am 1ff2df3f: am 82a2687a: Merge "Fix cp(1) for files in /proc."Elliott Hughes2014-07-222-12/+12
|\ \ \ \ | |/ / /
| * | | Merge "Fix cp(1) for files in /proc."Elliott Hughes2014-07-222-12/+12
| |\ \ \
| | * | | Fix cp(1) for files in /proc.Elliott Hughes2014-07-222-12/+12
| | |/ /
* | | | am 1575e163: am 34627d82: Merge "Stop and start netd explicitly for "adb shel...Sreeram Ramachandran2014-07-222-0/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Stop and start netd explicitly for "adb shell stop/start".Sreeram Ramachandran2014-07-192-0/+2
| |/
* | newfs_msdos: Added option to cluster-align the start of the root directoryDaniel Rosenberg2014-07-161-31/+69
* | am ce61f74f: am 56cbd19b: Merge "Fix build."Christopher Ferris2014-07-121-1/+1
|\ \ | |/
| * Fix build.Christopher Ferris2014-07-101-1/+1
* | am 802943ab: am 8098114c: Merge "Sync with upstream grep."Elliott Hughes2014-07-124-19/+19
|\ \ | |/
| * Sync with upstream grep.Elliott Hughes2014-07-104-19/+19
* | am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing"Elliott Hughes2014-07-121-1/+0
|\ \ | |/
| * fix duplicated grep usage printingRocky Zhang2014-07-111-1/+0
* | Made formatting for newfs_msdos.c more uniformDaniel Rosenberg2014-07-091-646/+617
* | am f0c19562: am fdd4ffd1: am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c."Elliott Hughes2014-06-261-17/+18
|\ \ | |/
| * Fix %llx to PRIx64 in nandread.c.Elliott Hughes2014-06-251-17/+18
* | am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr...Colin Cross2014-06-191-14/+8
|\ \ | |/
| * Use inet_ntoa to display ipaddr and mask valuesBhanu Chetlapalli2014-06-181-14/+8
| * Add mknod utility to system/core/toolboxSujith Ramakrishnan2014-06-112-0/+96
| * Getevent: make sure the monotonic timestamp is displayed; warning cleanup.Sasha Levitskiy2014-06-111-4/+10
| * toolbox: Add nohup commandGlenn Kasten2014-06-112-0/+27
* | resolved conflicts for merge of 41b797de to masterKenny Root2014-06-112-70/+68
|\ \ | |/
| * Switch md5 over to openssl rather than libc.Elliott Hughes2014-06-092-68/+66
* | am 7bbfb8cb: am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of...Elliott Hughes2014-05-221-2/+0
|\ \ | |/
| * Remove unnecessary #includes of <sys/atomics.h>.Elliott Hughes2014-05-221-2/+0
* | am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"Greg Hackmann2014-05-211-2/+2
|\ \ | |/