summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add comment to discourage use of cutils/atomic.h.Hans Boehm2014-07-111-2/+33
* Merge "Fix build."Christopher Ferris2014-07-101-1/+1
|\
| * Fix build.Christopher Ferris2014-07-101-1/+1
|/
* Merge "Sync with upstream grep."Elliott Hughes2014-07-104-19/+19
|\
| * Sync with upstream grep.Elliott Hughes2014-07-104-19/+19
|/
* Merge "fix duplicated grep usage printing"Elliott Hughes2014-07-101-1/+0
|\
| * fix duplicated grep usage printingRocky Zhang2014-07-111-1/+0
|/
* Merge "logd: test: disable kernel LOGGER"Mark Salyzyn2014-07-101-5/+3
|\
| * logd: test: disable kernel LOGGERMark Salyzyn2014-07-101-5/+3
|/
* Merge "Fix environment variable assignment in init"Elliott Hughes2014-07-102-8/+22
|\
| * Fix environment variable assignment in initJames Morrissey2014-07-102-8/+22
|/
* Merge "adbd: adb root should terminate adbd only if it's debuggable"Badhri Jagan Sridharan2014-07-091-1/+12
|\
| * adbd: adb root should terminate adbd only if it's debuggablejzhuan52014-05-051-1/+12
* | Merge "Fix arm emulator "D register out of range for selected VFP version" bu...Elliott Hughes2014-07-092-0/+9
|\ \
| * | Fix arm emulator "D register out of range for selected VFP version" build fai...Elliott Hughes2014-07-092-0/+9
|/ /
* | Merge "Integrate vfp-crasher with crasher."Elliott Hughes2014-07-098-161/+75
|\ \
| * | Integrate vfp-crasher with crasher.Elliott Hughes2014-07-098-161/+75
* | | Merge "Fix typo in fs.h"Elliott Hughes2014-07-091-1/+1
|\ \ \
| * | | Fix typo in fs.hMarkus Mayer2014-07-091-1/+1
* | | | Merge "restorecon_recursive /cache"Nick Kralevich2014-07-081-3/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | restorecon_recursive /cacheNick Kralevich2014-07-091-3/+1
|/ / /
* | | Merge "Fix sdcard's FUSE_FSYNCDIR handling."Elliott Hughes2014-07-051-7/+16
|\ \ \
| * | | Fix sdcard's FUSE_FSYNCDIR handling.Elliott Hughes2014-07-081-7/+16
|/ / /
* | | Merge "Make sdcard log to the log rather than stderr."Elliott Hughes2014-07-081-2/+5
|\ \ \
| * | | Make sdcard log to the log rather than stderr.Elliott Hughes2014-07-081-2/+5
* | | | Merge "Create a data directory for netd and other network-related files."Sreeram Ramachandran2014-07-021-0/+1
|\ \ \ \
| * | | | Create a data directory for netd and other network-related files.Sreeram Ramachandran2014-07-081-0/+1
* | | | | Merge "Fix LP64 tombstone.cpp build failure."Elliott Hughes2014-07-081-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix LP64 tombstone.cpp build failure.Elliott Hughes2014-07-081-1/+1
|/ / / /
* | | | Merge "Improving maps output."Elliott Hughes2014-07-072-15/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Improving maps output.Brigid Smith2014-07-082-15/+25
* | | | Merge "Remove sshd."dcashman2014-07-071-6/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove sshd.dcashman2014-07-071-6/+0
* | | | Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"Nick Kralevich2014-07-071-13/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | ueventd fixup_sys_perms: fixup SELinux labels unconditionallyNick Kralevich2014-07-071-13/+15
|/ / /
* | | Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"Mark Salyzyn2014-07-071-1/+1
|\ \ \
| * | | logcat: parse failure for -n <KBsize> and -r <rotate limit>Mark Salyzyn2014-07-071-1/+1
|/ / /
* | | Merge "logd_write: set SOCK_CLOEXEC on socket"Nick Kralevich2014-07-031-1/+1
|\ \ \
| * | | logd_write: set SOCK_CLOEXEC on socketNick Kralevich2014-07-021-1/+1
|/ / /
* | | Merge "ueventd: allow matching symlink names when setting permissions"Colin Cross2014-07-021-13/+38
|\ \ \
| * | | ueventd: allow matching symlink names when setting permissionsColin Cross2014-07-021-13/+38
* | | | Merge "implement LOG_EVENT_STRING"Nick Kralevich2014-07-014-1/+46
|\ \ \ \ | |_|/ / |/| | |
| * | | implement LOG_EVENT_STRINGNick Kralevich2014-07-014-1/+46
|/ / /
* | | Merge "Remove an unused #include of <sys/_properties.h>."Elliott Hughes2014-06-271-3/+0
|\ \ \
| * | | Remove an unused #include of <sys/_properties.h>.Elliott Hughes2014-06-301-3/+0
* | | | Merge "Charger: Avoid animation while not charging DO NOT MERGE"Todd Poynor2014-06-301-11/+20
|\ \ \ \
| * | | | Charger: Avoid animation while not charging DO NOT MERGEJenny TC2014-06-301-11/+20
|/ / / /
* | | | Merge "Build pixelflinger tests as native tests, not executables."Narayan Kamath2014-06-266-6/+14
|\ \ \ \
| * | | | Build pixelflinger tests as native tests, not executables.Narayan Kamath2014-06-266-6/+14
* | | | | Merge "Rename __unused to __UNUSED for glibc support."Ian Rogers2014-06-281-6/+6
|\ \ \ \ \