summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-231-0/+91
|\
| * Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-221-0/+91
| |\
| | * fs_mgr: Support filesystem labels in fstabChristoffer Dall2015-01-171-0/+91
* | | am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"Mark Salyzyn2015-01-221-1/+1
|\ \ \ | |/ /
| * | Merge "liblog: logcat color output corrupted on 32-bit"Mark Salyzyn2015-01-221-1/+1
| |\ \
| | * | liblog: logcat color output corrupted on 32-bitMark Salyzyn2015-01-221-1/+1
| |/ /
* | | am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."Christopher Ferris2015-01-224-82/+129
|\ \ \ | |/ /
| * | Merge "Move 32 bit/64 bit check into debuggerd."Christopher Ferris2015-01-214-82/+129
| |\ \
| | * | Move 32 bit/64 bit check into debuggerd.Christopher Ferris2015-01-204-82/+129
* | | | am ce34551c: Merge "Lose id to toybox."Elliott Hughes2015-01-172-58/+0
|\ \ \ \ | |/ / /
| * | | Merge "Lose id to toybox."Elliott Hughes2015-01-172-58/+0
| |\ \ \ | | |/ / | |/| |
| | * | Lose id to toybox.Elliott Hughes2015-01-162-58/+0
| |/ /
* | | am 45c4c06f: Merge "Remove unused cruft from libcutils."Elliott Hughes2015-01-163-117/+0
|\ \ \ | |/ /
| * | Merge "Remove unused cruft from libcutils."Elliott Hughes2015-01-163-117/+0
| |\ \
| | * | Remove unused cruft from libcutils.Elliott Hughes2015-01-153-117/+0
| |/ /
* | | am 9f72ef89: Merge "Extend to receive NFLOG packets."Jeff Sharkey2015-01-168-19/+86
|\ \ \ | |/ /
| * | Merge "Extend to receive NFLOG packets."Jeff Sharkey2015-01-168-19/+86
| |\ \
| | * | Extend to receive NFLOG packets.Jeff Sharkey2015-01-158-19/+86
* | | | am 17e2f436: Merge "Lose cmp to toybox."Elliott Hughes2015-01-152-92/+0
|\ \ \ \ | |/ / /
| * | | Merge "Lose cmp to toybox."Elliott Hughes2015-01-152-92/+0
| |\ \ \
| | * | | Lose cmp to toybox.Elliott Hughes2015-01-152-92/+0
* | | | | am 791a6905: Merge "Add timed versions of stack dumping functions."Christopher Ferris2015-01-150-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add timed versions of stack dumping functions."Christopher Ferris2015-01-152-3/+44
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add timed versions of stack dumping functions.Christopher Ferris2015-01-152-3/+44
| |/ / /
* | | | am 3d7951d4: Merge "Lose chown to toybox."Elliott Hughes2015-01-154-377/+0
|\ \ \ \ | |/ / /
| * | | Merge "Lose chown to toybox."Elliott Hughes2015-01-154-377/+0
| |\ \ \
| | * | | Lose chown to toybox.Elliott Hughes2015-01-154-377/+0
| |/ / /
* | | | am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into...Dmitry Shmidt2015-01-151-1/+0
|\ \ \ \
| * \ \ \ Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-devDmitry Shmidt2015-01-151-1/+0
| |\ \ \ \
| | * | | | android_filesystem: Remove setuid bits from tcpdumpDmitry Shmidt2015-01-151-1/+0
* | | | | | am c6c3c7d4: Merge "Remove explict use of ASCII encoding" into lmp-mr1-devJean-Michel Trivi2015-01-150-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Remove explict use of ASCII encoding" into lmp-mr1-devJean-Michel Trivi2015-01-152-2/+2
| |\ \ \ \ \
| | * | | | | Remove explict use of ASCII encodingAl Sutton2015-01-142-2/+2
* | | | | | | am 6c555ea3: (-s ours) Merge "Return path including executable instead of wit...Jean-Michel Trivi2015-01-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Return path including executable instead of without" into lmp-mr1-devJean-Michel Trivi2015-01-152-10/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Return path including executable instead of withoutAl Sutton2015-01-142-10/+10
* | | | | | | am 1a65d5b3: (-s ours) Merge "Fix building on modern versions of Xcode and OS...Jean-Michel Trivi2015-01-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-devJean-Michel Trivi2015-01-152-15/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix building on modern versions of Xcode and OS X.Al Sutton2015-01-142-15/+16
* | | | | | | am e232949c: Merge "sdcard : inode numbers must be fully representable as uin...Narayan Kamath2015-01-150-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "sdcard : inode numbers must be fully representable as uint32_t."Narayan Kamath2015-01-151-1/+34
| |\ \ \ \ \ \
| | * | | | | | sdcard : inode numbers must be fully representable as uint32_t.Narayan Kamath2015-01-151-1/+34
* | | | | | | | am 0f86444b: Merge "sdcard : inode numbers must be fully representable as uin...Narayan Kamath2015-01-151-1/+34
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "sdcard : inode numbers must be fully representable as uint32_t." into ...Narayan Kamath2015-01-151-1/+34
| |\ \ \ \ \ \ \
| | * | | | | | | sdcard : inode numbers must be fully representable as uint32_t.Narayan Kamath2015-01-141-1/+34
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am 5f2ff6a9: Add timed versions of stack dumping functions.Christopher Ferris2015-01-152-3/+44
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add timed versions of stack dumping functions.Christopher Ferris2015-01-142-3/+44
| |/ / / / / /
* | | | | | | am 41341eea: Merge "Lose date to toybox (as date and hwclock)."Elliott Hughes2015-01-152-228/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Lose date to toybox (as date and hwclock)."Elliott Hughes2015-01-142-228/+0
| |\ \ \ \ \ \
| | * | | | | | Lose date to toybox (as date and hwclock).Elliott Hughes2015-01-142-228/+0
| |/ / / / / /