summaryrefslogtreecommitdiffstats
path: root/toolbox
Commit message (Expand)AuthorAgeFilesLines
...
| * fix: making lsof show devies and loaded .so file names correctlyDmitriy Ivanov2014-03-041-1/+1
* | am 2ae567c8: am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) uid_from...Elliott Hughes2014-03-013-12/+41
|\ \ | |/
| * Declare (and simplify) uid_from_user.Elliott Hughes2014-02-283-12/+41
* | am f767e9c9: am 7c5a9d24: am fbcdf6f9: Merge "Switch to BSD chown (for -R, pr...Elliott Hughes2014-03-013-69/+354
|\ \ | |/
| * Merge "Switch to BSD chown (for -R, primarily)."Elliott Hughes2014-03-013-69/+354
| |\
| | * Switch to BSD chown (for -R, primarily).Elliott Hughes2014-02-283-69/+354
* | | am 1f570812: am d262b2a8: am 54bb1d3b: Merge "Fix grep -f."Elliott Hughes2014-03-011-2/+0
|\ \ \ | |/ /
| * | Fix grep -f.Elliott Hughes2014-02-281-2/+0
| |/
* | am 51437ed2: am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of <asm...Elliott Hughes2014-02-243-3/+0
|\ \ | |/
| * Remove unused #includes of <asm/page.h>.Elliott Hughes2014-02-243-3/+0
* | am 490963a5: am c0f95624: am 783eb168: Merge "Add -D option to restorecon for...Nick Kralevich2014-02-201-2/+5
|\ \ | |/
| * Add -D option to restorecon for relabeling /data/data.Stephen Smalley2014-02-181-2/+5
* | am e41420bd: am 488b5eaf: am 2e7347d6: Merge "Convert all selinux_android_res...Nick Kralevich2014-02-131-1/+1
|\ \ | |/
| * Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-121-1/+1
| |\
| | * Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-071-1/+1
* | | am a1ebd4d5: am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nan...Elliott Hughes2014-02-101-4/+0
|\ \ \ | |/ /
| * | Remove a pre-uapi hack from nandread.Elliott Hughes2014-02-071-4/+0
| |/
* | am 52ca10d1: am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and li...Nick Kralevich2014-02-071-92/+15
|\ \ | |/
| * Unify toolbox restorecon and libselinux restorecon implementations.Stephen Smalley2014-02-061-92/+15
* | Merge "Add mknod utility to system/core/toolbox"Sujith Ramakrishnan2014-01-242-0/+96
|\ \
| * | Add mknod utility to system/core/toolboxSujith Ramakrishnan2014-01-172-0/+96
* | | am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."Elliott Hughes2014-01-171-25/+31
|\ \ \ | | |/ | |/|
| * | Fix 'r' for LP64.Elliott Hughes2014-01-171-25/+31
* | | am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'...Elliott Hughes2014-01-172-162/+0
|\ \ \ | |/ /
| * | Remove obsolete 'setconsole' command.Elliott Hughes2014-01-162-162/+0
* | | resolved conflicts for merge of ec9e5891 to masterElliott Hughes2014-01-169-28/+15
|\ \ \ | |/ / | | / | |/ |/|
| * system/core 64-bit cleanup.Elliott Hughes2014-01-169-28/+15
* | am 58c4a7dd: am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date ...Benoit Goby2014-01-101-1/+1
|\ \ | |/
| * toolbox: Fix date tool with /dev/alarmBenoit Goby2014-01-091-1/+1
* | am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* consta...Elliott Hughes2014-01-081-6/+0
|\ \ | |/
| * SWAP_FLAG_* constants are now in <sys/swap.h>.Elliott Hughes2014-01-071-6/+0
* | am 05bfe7fb: am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: re-int...Nick Kralevich2014-01-031-0/+1
|\ \ | |/
| * toolbox-ls: re-introduce clobbered error messageWilliam Roberts2014-01-031-0/+1
* | am 796be8f1: am b1a82bcb: am f1da46d2: am d27498cb: Merge "toolbox: date: use...Greg Hackmann2013-12-181-14/+80
|\ \ | |/
| * toolbox: date: use RTC subsystem on devices without /dev/alarmGreg Hackmann2013-12-171-14/+80
* | am 619376f4: am e34618a2: am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix...Greg Hackmann2013-12-181-1/+1
|\ \ | |/
| * toolbox: date: fix parameter type warningsGreg Hackmann2013-12-171-1/+1
* | am 07dbb562: am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: u...Greg Hackmann2013-12-181-4/+14
|\ \ | |/
| * toolbox: uptime: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-4/+14
* | am e75af574: am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: f...Greg Hackmann2013-12-181-1/+2
|\ \ | |/
| * toolbox: uptime: fix unused parameter warningsGreg Hackmann2013-12-171-1/+2
* | am bfb1d8a2: am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."Nick Kralevich2013-12-111-3/+3
|\ \ | |/
| * Minor cleanups.Nick Kralevich2013-11-271-3/+3
* | Merge "Getevent: make sure the monotonic timestamp is displayed; warning clea...Sasha Levitskiy2013-12-111-4/+10
|\ \
| * | Getevent: make sure the monotonic timestamp is displayed; warning cleanup.Sasha Levitskiy2013-12-101-4/+10
* | | am 5e362c87: am 71e096c8: Merge "Increase buffer size, use bounds checking fu...Nick Kralevich2013-12-021-16/+16
|\ \ \ | | |/ | |/|
| * | Increase buffer size, use bounds checking functionsNick Kralevich2013-11-271-16/+16
| * | Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEADThe Android Open Source Project2013-11-2211-82/+366
| |\ \
* | \ \ am 36ff3bd2: am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old ...Elliott Hughes2013-11-111-2/+6
|\ \ \ \
| * \ \ \ am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi heade...Elliott Hughes2013-11-111-2/+6
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |