summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 07a1b526: am 75161485: Merge "Introduce netd_client, a dynamic library tha...Sreeram Ramachandran2014-05-145-0/+230
|\
| * am 75161485: Merge "Introduce netd_client, a dynamic library that talks to ne...Sreeram Ramachandran2014-05-145-0/+230
| |\
| | * Merge "Introduce netd_client, a dynamic library that talks to netd."Sreeram Ramachandran2014-05-145-0/+230
| | |\
| | | * Introduce netd_client, a dynamic library that talks to netd.Sreeram Ramachandran2014-05-145-0/+230
* | | | am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwma...Sreeram Ramachandran2014-05-141-0/+1
|\ \ \ \ | |/ / /
| * | | am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."Sreeram Ramachandran2014-05-141-0/+1
| |\ \ \ | | |/ /
| | * | Merge "Introduce fwmarkd: a service to set the fwmark of sockets."Sreeram Ramachandran2014-05-141-0/+1
| | |\ \ | | | |/
| | | * Introduce fwmarkd: a service to set the fwmark of sockets.Sreeram Ramachandran2014-05-141-0/+1
* | | | am 4f801e60: am 3fe8afa4: Merge "fastboot: turn on -Werror"Mark Salyzyn2014-05-147-42/+32
|\ \ \ \ | |/ / /
| * | | am 3fe8afa4: Merge "fastboot: turn on -Werror"Mark Salyzyn2014-05-147-42/+32
| |\ \ \ | | |/ /
| | * | Merge "fastboot: turn on -Werror"Mark Salyzyn2014-05-147-42/+32
| | |\ \
| | | * | fastboot: turn on -WerrorMark Salyzyn2014-05-147-42/+32
* | | | | am ddf516f8: am 506a536b: Merge "libzipfile: turn on -Werror"Mark Salyzyn2014-05-143-36/+10
|\ \ \ \ \ | |/ / / /
| * | | | am 506a536b: Merge "libzipfile: turn on -Werror"Mark Salyzyn2014-05-143-36/+10
| |\ \ \ \ | | |/ / /
| | * | | Merge "libzipfile: turn on -Werror"Mark Salyzyn2014-05-143-36/+10
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * libzipfile: turn on -WerrorMark Salyzyn2014-05-143-36/+10
| | |/
* | | am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for fwmark reflection ...Sreeram Ramachandran2014-05-131-0/+7
|\ \ \ | |/ /
| * | am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table num...Sreeram Ramachandran2014-05-131-0/+7
| |\ \ | | |/
| | * Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."Sreeram Ramachandran2014-05-131-0/+7
| | |\
| | | * Set kernel proc files for fwmark reflection and table numbers for RAs.Sreeram Ramachandran2014-05-131-0/+7
| | |/
* | | am c563c38d: am 905874ab: Merge "adb: avoid compilation errors for unused res...Kenny Root2014-05-131-2/+2
|\ \ \ | |/ /
| * | am 905874ab: Merge "adb: avoid compilation errors for unused results"Kenny Root2014-05-131-2/+2
| |\ \ | | |/
| | * Merge "adb: avoid compilation errors for unused results"Kenny Root2014-05-131-2/+2
| | |\
| | | * adb: avoid compilation errors for unused resultsKenny Root2014-05-131-2/+2
| | |/
* | | am e37e3301: am 09b84870: Merge "Remove declaration of unused static variable"Ian Rogers2014-05-121-2/+0
|\ \ \ | |/ /
| * | am 09b84870: Merge "Remove declaration of unused static variable"Ian Rogers2014-05-121-2/+0
| |\ \ | | |/
| | * Merge "Remove declaration of unused static variable"Ian Rogers2014-05-121-2/+0
| | |\
| | | * Remove declaration of unused static variableBernhard Rosenkraenzer2014-05-121-2/+0
| | |/
* | | am 3a49aa7b: am 9428a289: Merge "Only include ucontext.h when necessary."Christopher Ferris2014-05-104-2/+3
|\ \ \ | |/ /
| * | am 9428a289: Merge "Only include ucontext.h when necessary."Christopher Ferris2014-05-104-2/+3
| |\ \ | | |/
| | * Merge "Only include ucontext.h when necessary."Christopher Ferris2014-05-104-2/+3
| | |\
| | | * Only include ucontext.h when necessary.Christopher Ferris2014-05-094-2/+3
| | |/
* | | am 0f5e9579: am b49f23ed: Merge "Fix ucontext_t forward declare for mac."Christopher Ferris2014-05-091-0/+5
|\ \ \ | |/ /
| * | am b49f23ed: Merge "Fix ucontext_t forward declare for mac."Christopher Ferris2014-05-091-0/+5
| |\ \ | | |/
| | * Merge "Fix ucontext_t forward declare for mac."Christopher Ferris2014-05-091-0/+5
| | |\
| | | * Fix ucontext_t forward declare for mac.Christopher Ferris2014-05-091-0/+5
| | |/
* | | am c1087e55: am bf6c2dbe: Merge "Fix mac build."Christopher Ferris2014-05-091-1/+3
|\ \ \ | |/ /
| * | am bf6c2dbe: Merge "Fix mac build."Christopher Ferris2014-05-091-1/+3
| |\ \ | | |/
| | * Merge "Fix mac build."Christopher Ferris2014-05-091-1/+3
| | |\
| | | * Fix mac build.Christopher Ferris2014-05-091-1/+3
| | |/
* | | am 66e31dc5: am 3a088524: Merge "Rewrite unwind thread handling."Christopher Ferris2014-05-0911-258/+269
|\ \ \ | |/ /
| * | am 3a088524: Merge "Rewrite unwind thread handling."Christopher Ferris2014-05-0911-258/+269
| |\ \ | | |/
| | * Merge "Rewrite unwind thread handling."Christopher Ferris2014-05-0911-258/+269
| | |\
| | | * Rewrite unwind thread handling.Christopher Ferris2014-05-0811-258/+269
* | | | am afcd2659: am dc0ea862: Merge "libziparchive: off64_t is not int64_t (part ...JP Abgrall2014-05-091-4/+4
|\ \ \ \ | |/ / /
| * | | am dc0ea862: Merge "libziparchive: off64_t is not int64_t (part deux)"JP Abgrall2014-05-091-4/+4
| |\ \ \ | | |/ /
| | * | Merge "libziparchive: off64_t is not int64_t (part deux)"JP Abgrall2014-05-091-4/+4
| | |\ \
| | | * | libziparchive: off64_t is not int64_t (part deux)Mark Salyzyn2014-05-081-4/+4
| | |/ /
* | | | am 3d2ad1ea: am f304730c: Merge "libziparchive: off64_t is not int64_t"JP Abgrall2014-05-091-10/+10
|\ \ \ \ | |/ / /
| * | | am f304730c: Merge "libziparchive: off64_t is not int64_t"JP Abgrall2014-05-091-10/+10
| |\ \ \ | | |/ /