summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 7208a015: Merge "Mutex: add timedLock() method"Jesse Hall2015-01-071-4/+24
|\
| * Merge "Mutex: add timedLock() method"Jesse Hall2015-01-071-4/+24
| |\
| | * Mutex: add timedLock() methodJesse Hall2015-01-071-4/+24
* | | am e892279b: Merge "liblog: Add log_time += operator"Mark Salyzyn2015-01-051-0/+12
|\ \ \ | |/ /
| * | liblog: Add log_time += operatorMark Salyzyn2015-01-051-0/+12
| |/
* | am da4f30c5: Merge "Remove incompatible Unicode compatibility types."Dan Albert2014-12-121-6/+0
|\ \ | |/
| * Merge "Remove incompatible Unicode compatibility types."Dan Albert2014-12-121-6/+0
| |\
| | * Remove incompatible Unicode compatibility types.Dan Albert2014-11-201-6/+0
* | | am 3570072c: Merge "Use full qualified name in macros."Chih-Hung Hsieh2014-12-111-3/+4
|\ \ \ | |/ /
| * | Use full qualified name in macros.Chih-Hung Hsieh2014-12-111-3/+4
* | | am 4fca5918: audio: add usage "virtual source" to audio attributes.Eric Laurent2014-12-101-0/+1
|\ \ \
| * | | audio: add usage "virtual source" to audio attributes.Eric Laurent2014-12-091-0/+1
* | | | am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
|\ \ \ \ | |/ / /
| * | | audio: new stream typesEric Laurent2014-11-241-4/+8
* | | | am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-251-5/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Only Windows doesn't have <sys/uio.h>.Elliott Hughes2014-11-251-5/+8
* | | | am 8eb770d3: Merge "Remove long-dead readtty."Elliott Hughes2014-11-251-1/+0
|\ \ \ \ | |/ / /
| * | | Remove long-dead readtty.Elliott Hughes2014-11-241-1/+0
* | | | am 456661e3: Merge "Fix Mac build."Elliott Hughes2014-11-221-1/+1
|\ \ \ \ | |/ / /
| * | | Fix Mac build.Elliott Hughes2014-11-221-1/+1
* | | | am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDI...Elliott Hughes2014-11-221-10/+5
|\ \ \ \ | |/ / /
| * | | Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-211-10/+5
* | | | am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."Dan Albert2014-11-201-0/+11
|\ \ \ \ | |/ / /
| * | | Add a pre-C++11 constexpr compatibility macro.Dan Albert2014-11-201-0/+11
| | |/ | |/|
* | | am ac252357: Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
|\ \ \ | |/ /
| * | Remove atomic-inline.h.Elliott Hughes2014-11-173-21/+2
* | | am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-172-8/+0
|\ \ \ | |/ /
| * | Remove the error-prone TARGET_CPU_SMP from system/core.Elliott Hughes2014-11-172-8/+0
* | | am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-148-1039/+112
|\ \ \ | |/ /
| * | Second attempt to "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-11-138-1039/+112
* | | am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-111-2/+2
|\ \ \ | |/ /
| * | kill HAVE_POSIX_FILEMAPYabin Cui2014-11-111-2/+2
* | | am 65a83bdf: Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
|\ \ \ | |/ /
| * | Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
| |\ \
| | * | Reserve some AIDs for OEMsJohan Redestig2014-11-101-0/+5
* | | | am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."Stephen Hines2014-11-091-0/+4
|\ \ \ \ | |/ / /
| * | | 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
| | |/ /
* | | | am aaa920d7: 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
| |/ /
| * | resolved conflicts for merge of e3c22c41 to stage-aosp-masterCalin Juravle2014-10-281-1/+1
| |\ \
| | * | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-271-1/+1
| * | | am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bod...Chih-Hung Hsieh2014-10-151-39/+11
| |\ \ \ | | |/ /
| * | | am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-10-048-124/+1039
| |\ \ \
| * \ \ \ am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-048-1039/+124
| |\ \ \ \
| * \ \ \ \ resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aospAndreas Gampe2014-09-241-3/+28
| |\ \ \ \ \
| * \ \ \ \ \ am f6cce347: audio: add HW hotword capture flagEric Laurent2014-09-241-3/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(...Elliott Hughes2014-09-231-8/+4
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-devCalin Juravle2014-10-281-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-271-1/+1