summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am f0cc42f5: am 4730328d: Merge "logd: create private/android_logger.h"Mark Salyzyn2015-01-241-0/+34
|\
| * am 4730328d: Merge "logd: create private/android_logger.h"Mark Salyzyn2015-01-231-0/+34
| |\
| | * logd: create private/android_logger.hMark Salyzyn2015-01-231-0/+34
* | | Merge "camera: add external camera facing enum"Zhijun He2015-01-231-1/+6
|\ \ \ | |/ / |/| |
| * | camera: add external camera facing enumZhijun He2015-01-221-1/+6
* | | am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."Christopher Ferris2015-01-221-27/+13
|\ \ \ | |/ / |/| / | |/
| * Move 32 bit/64 bit check into debuggerd.Christopher Ferris2015-01-201-27/+13
* | am 45c4c06f: Merge "Remove unused cruft from libcutils."Elliott Hughes2015-01-161-34/+0
|\ \ | |/
| * Remove unused cruft from libcutils.Elliott Hughes2015-01-151-34/+0
* | am 9f72ef89: Merge "Extend to receive NFLOG packets."Jeff Sharkey2015-01-163-0/+3
|\ \ | |/
| * Merge "Extend to receive NFLOG packets."Jeff Sharkey2015-01-163-0/+3
| |\
| | * Extend to receive NFLOG packets.Jeff Sharkey2015-01-153-0/+3
| * | Add timed versions of stack dumping functions.Christopher Ferris2015-01-151-0/+15
| |/
* | 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 5f2ff6a9: Add timed versions of stack dumping functions.Christopher Ferris2015-01-151-0/+15
|\ \ \ \ | |/ / /
| * | | Add timed versions of stack dumping functions.Christopher Ferris2015-01-141-0/+15
| |/ /
* | | am ce1928e9: Merge "Add required casts for clang/llvm -Wc++11-narrowing"Chih-Hung Hsieh2015-01-131-2/+2
|\ \ \ | | |/ | |/|
| * | Add required casts for clang/llvm -Wc++11-narrowingChih-Hung Hsieh2015-01-121-2/+2
* | | am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPER...Elliott Hughes2015-01-121-16/+0
|\ \ \ | |/ /
| * | Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.Elliott Hughes2015-01-121-16/+0
* | | am 9da414f9: Merge "Linux always has POSIX clocks available."Elliott Hughes2015-01-101-3/+3
|\ \ \ | |/ /
| * | Linux always has POSIX clocks available.Elliott Hughes2015-01-091-3/+3
* | | am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>."Elliott Hughes2015-01-091-1/+1
|\ \ \ | |/ /
| * | You either have winsock or <sys/sockets.h>.Elliott Hughes2015-01-091-1/+1
* | | 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
| | |/ | |/|