summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9301f216: am 8f6dfc7d: am e65c2210: Merge "log: Add check for LINT_RLOG"Mark Salyzyn2015-04-101-4/+23
|\
| * log: Add check for LINT_RLOGMark Salyzyn2015-04-101-4/+23
* | am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible a...Nick Kralevich2015-04-071-2/+14
|\|
| * logd: Don't embed a flexible array member within another structNick Kralevich2015-04-071-2/+14
* | am 2904e949: am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: us...Mark Salyzyn2015-04-061-6/+3
|\|
| * android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLSMark Salyzyn2015-04-061-6/+3
| * Allow inputflinger to have CAP_BLOCK_SUSPEND.Tim Kilbourn2015-04-061-1/+3
| * android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-061-109/+27
* | android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-061-110/+27
* | Merge "Move audio includes to system/media/audio"Rom Lemarchand2015-04-033-1706/+0
|\ \
| * | Move audio includes to system/media/audioRom Lemarchand2015-04-033-1706/+0
* | | am 6c7c6d04: am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."Elliott Hughes2015-04-031-5/+5
|\ \ \ | |/ / |/| |
| * | am ea975880: Merge "Only Windows doesn\'t have %zd."Elliott Hughes2015-04-031-5/+5
| |\|
| | * Only Windows doesn't have %zd.Elliott Hughes2015-04-031-5/+5
* | | am cd868370: am b2c3473d: am 70df6f85: Merge "Just use snprintf for android_g...Elliott Hughes2015-04-031-19/+9
|\| |
| * | am 70df6f85: Merge "Just use snprintf for android_get_control_socket."Elliott Hughes2015-04-021-19/+9
| |\|
| | * Just use snprintf for android_get_control_socket.Elliott Hughes2015-04-021-19/+9
* | | am b4573331: am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing wit...Elliott Hughes2015-04-031-1/+1
|\| |
| * | am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."Elliott Hughes2015-04-021-1/+1
| |\|
| | * Be more intention-revealing with libcutils' strlcpy.Elliott Hughes2015-04-021-1/+1
* | | Merge "audio.h: add AUDIO_FORMAT_DTS"Phil Burk2015-04-021-0/+5
|\ \ \
| * | | audio.h: add AUDIO_FORMAT_DTSPhil Burk2015-04-011-0/+5
* | | | am 797b246f: am a1f69f18: am 21593186: Merge "Move all libcutils tests into t...Elliott Hughes2015-04-021-0/+5
|\ \ \ \ | | |/ / | |/| |
| * | | am 21593186: Merge "Move all libcutils tests into the gtests."Elliott Hughes2015-04-021-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | Move all libcutils tests into the gtests.Elliott Hughes2015-04-021-0/+5
* | | | am 88defca0: am b3b1757f: am 0c266ef2: Merge "Define atrace_* functions for b...Richard Uhler2015-04-011-14/+0
|\| | |
| * | | am 0c266ef2: Merge "Define atrace_* functions for both target and host."Richard Uhler2015-04-011-14/+0
| |\| |
| | * | Merge "Define atrace_* functions for both target and host."Richard Uhler2015-04-011-14/+0
| | |\ \
| | | * | Define atrace_* functions for both target and host.Richard Uhler2015-03-271-14/+0
* | | | | am 22790dfc: am 246e9d50: am 9dc41d5d: Merge "Refactor the code."Christopher Ferris2015-03-311-12/+9
|\| | | |
| * | | | am 9dc41d5d: Merge "Refactor the code."Christopher Ferris2015-03-311-12/+9
| |\| | |
| | * | | Merge "Refactor the code."Christopher Ferris2015-03-311-12/+9
| | |\ \ \
| | | * | | Refactor the code.Christopher Ferris2015-03-311-12/+9
| | | |/ /
* | | | | Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Tim Kilbourn2015-03-312-1/+4
|\ \ \ \ \
| * | | | | Allow inputflinger to have CAP_BLOCK_SUSPEND.Tim Kilbourn2015-03-252-1/+4
* | | | | | Merge "graphics: add android raw12 format"Yin-Chia Yeh2015-03-311-0/+50
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | graphics: add android raw12 formatYin-Chia Yeh2015-03-301-0/+50
* | | | | | Merge "Use eventfd instead of pipe in Looper."Tim Kilbourn2015-03-301-2/+1
|\ \ \ \ \ \
| * | | | | | Use eventfd instead of pipe in Looper.Tim Kilbourn2015-03-271-2/+1
* | | | | | | am 4ce3c828: am 0cd316a4: am 5db3936d: Merge "Log more timing information fro...Elliott Hughes2015-03-281-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | am 5db3936d: Merge "Log more timing information from init."Elliott Hughes2015-03-281-1/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Log more timing information from init.Elliott Hughes2015-03-281-1/+3
| | | |_|/ | | |/| |
* | | | | am 1188a4d8: am a596623f: am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Win...Dan Albert2015-03-271-1/+1
|\| | | | | |_|_|/ |/| | |
| * | | am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."Dan Albert2015-03-271-1/+1
| |\| |
| | * | O_CLOEXEC is O_NOINHERIT on Windows.Dan Albert2015-03-271-1/+1
* | | | Merge "Fix comment in audio definitions header"Jean-Michel Trivi2015-03-241-1/+1
|\ \ \ \
| * | | | Fix comment in audio definitions headerJean-Michel Trivi2015-03-241-1/+1
* | | | | am bdabcf4c: am 730d7c53: am 8e1697e7: Merge "Fix mac sdk build."Christopher Ferris2015-03-241-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 8e1697e7: Merge "Fix mac sdk build."Christopher Ferris2015-03-241-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix mac sdk build.Christopher Ferris2015-03-231-0/+1