summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Switch frameworks/av/media/libmedia to the new icu."Elliott Hughes2014-07-091-1/+1
|\
| * Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
* | Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-024-7/+7
|\ \ | |/ |/|
| * m4v_h263_enc: Use uint32_t for ULongAshok Bhat2014-07-024-7/+7
|/
* Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"Lajos Molnar2014-06-241-3/+4
|\
| * DO NOT MERGE: Fix for SW video decoder OMX profile/level queryXiaosong Wei2014-06-241-3/+4
|/
* Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-234-29/+29
|\
| * libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
|/
* Merge "Fix buffer allocation"Marco Nelissen2014-06-201-1/+1
|\
| * Fix buffer allocationMarco Nelissen2014-06-231-1/+1
|/
* Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-121-1/+1
|\
| * Use char x[] rather than char x[0].Elliott Hughes2014-06-121-1/+1
* | Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
|\ \
| * | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| |/
* | Merge "Update OMX messages for 64 bit"Narayan Kamath2014-06-1111-151/+237
|\ \ | |/ |/|
| * Update OMX messages for 64 bitAndy Hung2014-06-1211-151/+237
|/
* Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-118-84/+57
|\
| * Offer a type-safe album art interface.Elliott Hughes2014-06-118-84/+57
* | Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-102-3/+1
|\ \ | |/ |/|
| * Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
|/
* Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
|\
| * Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
|/
* Merge "libcamera_client: 64-bit compile issue"Mark Salyzyn2014-06-092-4/+4
|\
| * libcamera_client: 64-bit compile issueMark Salyzyn2014-06-092-4/+4
|/
* Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\
| * Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
* | am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \
| * \ Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| |\ \
| | * | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| |/ /
* | | am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
|\ \ \ | |/ /
| * | Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| |\ \ | | |/ | |/|
| | * Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| |/
* | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-222-4/+2
|\ \ | |/
| * Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-222-4/+2
| |\
| | * Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-222-4/+2
| |/
* | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-228-39/+39
|\ \ | |/
| * Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-228-39/+39
| |\
| | * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-228-39/+39
| |/
* | am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
|\ \ | |/
| * Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
| |\
| | * Restore accidentally-removed NULL timeout.Elliott Hughes2014-05-211-1/+1
| |/
* | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-225-39/+39
|\ \ | |/
| * Merge "Move frameworks/av off private API."Elliott Hughes2014-05-225-39/+39
| |\
| | * Move frameworks/av off private API.Elliott Hughes2014-05-215-39/+39
| |/
* | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
|\ \ | |/
| * Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
| |\
| | * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-213-14/+14
| |/
* | am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL ...Eric Laurent2014-05-191-1/+4
|\ \ | |/
| * Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloade...Eric Laurent2014-05-191-1/+4
| |\
| | * Codec Offload: Add NULL check as mCallbackThread is NULLUday Gupta2014-05-131-1/+4