summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* kill HAVE_POSIX_FILEMAPYabin Cui2014-11-112-14/+12
* Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."Elliott Hughes2014-11-101-1/+2
|\
| * Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885.Elliott Hughes2014-11-101-1/+2
|/
* Merge "When new error happend,then errno should be updated accordingly. Other...Elliott Hughes2014-11-101-1/+2
|\
| * When new error happend,then errno should be updated accordingly.Bo Huang2014-11-101-1/+2
|/
* Merge "init isn't built for platforms without dirent::d_type."Elliott Hughes2014-11-101-2/+0
|\
| * init isn't built for platforms without dirent::d_type.Elliott Hughes2014-11-101-2/+0
|/
* Merge "bionic's struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-6/+6
|\
| * bionic's struct stat is now POSIX-compliant.Elliott Hughes2014-11-101-6/+6
|/
* Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
|\
| * Reserve some AIDs for OEMsJohan Redestig2014-11-101-0/+5
* | Merge "Move winsock2.h in front of a potential windows.h include."Stephen Hines2014-11-091-0/+4
|\ \
| * | Move winsock2.h in front of a potential windows.h include.Stephen Hines2014-11-081-0/+4
| |/
* | Merge "Make Unicode.h use types that match libc++."Dan Albert2014-11-091-2/+2
|\ \
| * | Make Unicode.h use types that match libc++.Dan Albert2014-11-081-2/+2
| |/
* | Merge "Remove dead code."Elliott Hughes2014-11-081-8/+0
|\ \ | |/ |/|
| * Remove dead code.Elliott Hughes2014-11-081-8/+0
|/
* am 452f08a0: Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
|\
| * Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
| |\
| | * Add razer usb vid for future use with adbStuart Wells2014-11-031-0/+3
* | | am 7a92d20e: Merge "Clean up some test makefiles."Dan Albert2014-11-054-44/+59
|\ \ \ | |/ /
| * | Merge "Clean up some test makefiles."Dan Albert2014-11-054-44/+59
| |\ \
| | * | Clean up some test makefiles.Dan Albert2014-11-044-44/+59
| |/ /
* | | am a11ac455: Merge "Fix debuggerd issues."Christopher Ferris2014-11-035-63/+56
|\ \ \ | |/ /
| * | Merge "Fix debuggerd issues."Christopher Ferris2014-11-035-63/+56
| |\ \ | | |/ | |/|
| | * Fix debuggerd issues.Christopher Ferris2014-11-035-63/+56
| |/
* | resolved conflicts for merge of cb8c583d to stage-aosp-masterDmitriy Ivanov2014-11-031-1/+1
|\ \ | |/
| * Merge "Fix ps <process name>"Dmitriy Ivanov2014-11-031-1/+1
| |\
| | * Fix ps <process name>Dmitriy Ivanov2014-11-031-1/+1
| |/
* | am c6dead70: Merge "maybe fix mac build"Nick Kralevich2014-11-022-0/+2
|\ \ | |/
| * Merge "maybe fix mac build"Nick Kralevich2014-11-022-0/+2
| |\
| | * maybe fix mac buildNick Kralevich2014-11-022-0/+2
| |/
* | am b968d5c8: Merge "Add shared library version of libziparchive."Ian Rogers2014-10-301-2/+15
|\ \ | |/
| * Merge "Add shared library version of libziparchive."Ian Rogers2014-10-301-2/+15
| |\
| | * Add shared library version of libziparchive.Ian Rogers2014-10-301-2/+15
| |/
* | am 91b76d7d: Merge "Made suffix length of rotated logcat files constant."Aristidis Papaioannou2014-10-292-2/+62
|\ \ | |/
| * Merge "Made suffix length of rotated logcat files constant."Aristidis Papaioannou2014-10-292-2/+62
| |\
| | * Made suffix length of rotated logcat files constant.Aristidis Papaioannou2014-10-292-2/+62
| |/
* | am 64989126: Merge "Add code cache tests to libnativebridge."Calin Juravle2014-10-295-1/+112
|\ \ | |/
| * Merge "Add code cache tests to libnativebridge."Calin Juravle2014-10-285-1/+112
| |\
| | * Add code cache tests to libnativebridge.Calin Juravle2014-10-285-1/+112
* | | am 8cf2ce10: Merge "Don\'t allow SUPPORTED_ABIs to be set by the native bridge."Narayan Kamath2014-10-281-43/+0
|\ \ \ | |/ /
| * | Merge "Don't allow SUPPORTED_ABIs to be set by the native bridge."Narayan Kamath2014-10-271-43/+0
| |\ \
| | * | Don't allow SUPPORTED_ABIs to be set by the native bridge.Narayan Kamath2014-10-221-43/+0
* | | | resolved conflicts for merge of e3c22c41 to stage-aosp-masterCalin Juravle2014-10-2811-47/+313
|\ \ \ \ | |/ / /
| * | | Merge "Handle code_cache dir creation in libnativebridge"Calin Juravle2014-10-2711-46/+312
| |\ \ \ | | | |/ | | |/|
| | * | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-2711-46/+312
* | | | am d88323b2: Merge "Add volatile to avoid clang optimization."Chih-Hung Hsieh2014-10-281-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Add volatile to avoid clang optimization."Chih-Hung Hsieh2014-10-241-1/+1
| |\ \ \
| | * | | Add volatile to avoid clang optimization.Chih-Hung Hsieh2014-10-231-1/+1
| |/ / /