summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aospBrian Carlstrom2013-05-141-0/+4
|\
| * Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().Elliott Hughes2013-05-141-0/+4
| * Modify debuggerd to cope with the abort message.Elliott Hughes2013-04-041-1/+1
* | Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-devJamie Gennis2013-05-081-1/+16
|\ \
| * | libcutils: add a trace tag for DalvikJamie Gennis2013-05-071-1/+16
* | | Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-devJeff Tinker2013-04-251-0/+2
|\ \ \
| * | | Add a new group for MediaDrm engine pluginsJeff Tinker2013-04-231-0/+2
| |/ /
* | | Remove DBUS from make and header filesMatthew Xie2013-04-231-1/+0
|/ /
* | Merge "graphics: add Android flexible YCbCr format" into jb-mr2-devAlex Ray2013-04-181-0/+54
|\ \
| * | graphics: add Android flexible YCbCr formatAlex Ray2013-04-091-0/+54
* | | Merge "cutils: add a way to disable tracing for a process" into jb-mr2-devJamie Gennis2013-04-161-1/+7
|\ \ \
| * | | cutils: add a way to disable tracing for a processJamie Gennis2013-04-151-1/+7
| |/ /
* | | Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-devKen Sumrall2013-04-151-0/+6
|\ \ \
| * | | klog: Have klog_write() call klog_init() if neededKen Sumrall2013-04-111-0/+6
| |/ /
* | | Add new resources trace.Dianne Hackborn2013-04-121-1/+2
|/ /
* | Modify debuggerd to cope with the abort message.Elliott Hughes2013-04-051-1/+1
* | libcutils: add support for app tracingJamie Gennis2013-03-281-1/+11
* | Merge "android_filesystem_config: add /vendor" into jb-mr2-devYing Wang2013-03-221-0/+2
|\ \
| * | android_filesystem_config: add /vendorColin Cross2013-03-201-0/+2
* | | Inline ldrex/strex for thumb2, remove ARMv5 remnants.Ian Rogers2013-03-211-123/+33
|/ /
* | cutils: trace: add asynchronous eventsAlex Ray2013-03-181-0/+41
* | sync: factor sw_sync functionality out of headerAlex Ray2013-03-052-8/+37
* | am b3be89df: am 3fb63338: Merge "android_filesystem_config.h: change ping and...Nick Kralevich2013-03-012-8/+134
|\ \
| * \ am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"Nick Kralevich2013-03-012-8/+134
| |\ \ | | |/
| | * android_filesystem_config.h: change ping and run-asNick Kralevich2013-03-012-8/+134
* | | am 96f60a8c: am ff03bc30: Merge "fix mac sdk build."Nick Kralevich2013-02-221-1/+0
|\ \ \ | |/ /
| * | am ff03bc30: Merge "fix mac sdk build."Nick Kralevich2013-02-221-1/+0
| |\ \ | | |/
| | * fix mac sdk build.Nick Kralevich2013-02-221-1/+0
* | | am 0d060d56: am e3f247c0: Merge "Add support for filesystem capabilities."Nick Kralevich2013-02-221-57/+61
|\ \ \ | |/ /
| * | am e3f247c0: Merge "Add support for filesystem capabilities."Nick Kralevich2013-02-221-57/+61
| |\ \ | | |/
| | * Add support for filesystem capabilities.Nick Kralevich2013-02-201-57/+61
* | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-151-1/+0
* | | am 1b69da3e: am 6711f76d: Merge "graphics.h: Remove unnecessary comments for ...Igor Murashkin2013-02-111-12/+2
|\ \ \ | |/ /
| * | am 6711f76d: Merge "graphics.h: Remove unnecessary comments for Y8/Y16 format...Igor Murashkin2013-02-111-12/+2
| |\ \
| | * | graphics.h: Remove unnecessary comments for Y8/Y16 formatsIgor Murashkin2013-02-111-12/+2
* | | | am fbb4a5ac: am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb...Igor Murashkin2013-02-111-0/+58
|\ \ \ \ | |/ / /
| * | | am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-devIgor Murashkin2013-02-111-0/+58
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * graphics.h: add new Y8, Y16 formatsIgor Murashkin2013-02-081-0/+58
| | * change AID_LOOP_RADIO uid assignmentDoug Zongker2013-01-291-1/+1
| * | am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."Ian Rogers2013-02-011-123/+33
| |\ \
| | * | Inline ldrex/strex for thumb2, remove ARMv5 remnants.Ian Rogers2013-02-011-123/+33
* | | | Revert "property_get: do argument checking."Nick Kralevich2013-02-041-20/+0
* | | | Revert "Fix win_sdk build."Nick Kralevich2013-02-041-6/+4
* | | | Fix win_sdk build.Nick Kralevich2013-02-021-4/+6
* | | | Merge "property_get: do argument checking."Nick Kralevich2013-02-011-0/+20
|\ \ \ \
| * | | | property_get: do argument checking.Nick Kralevich2013-01-311-0/+20
* | | | | Merge "audio: added input device for front + back mic"Eric Laurent2013-01-311-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audio: added input device for front + back micEric Laurent2013-01-221-0/+1
* | | | | cutils: remove dead code.Nick Kralevich2013-01-291-1/+0
* | | | | am 8cc97302: resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aospDoug Zongker2013-01-291-0/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /