Gloria Wang cbb053c3c9 resolved conflicts for merge of 965f960e to master ...

Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338

2010-10-25 16:56:49 -07:00

..

java/android

Update BT APIs return type from Set to List.

2010-10-22 11:36:28 -07:00

jni

am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread

2010-10-22 22:47:52 -07:00

libdrm

Merge "Modified libdrm to support SuperH platform"

2010-05-14 19:36:40 -07:00

libeffects

am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread

2010-09-28 17:39:54 -07:00

libmedia

OMX extension to support storing meta data in video input buffers during recording

2010-10-21 14:06:17 -07:00

libmediaplayerservice

Merge fb474872 from gingerbread-plus-aosp

2010-10-18 08:33:38 -07:00

libstagefright

resolved conflicts for merge of 965f960e to master

2010-10-25 16:56:49 -07:00

mediaserver

move native services under services/

2010-07-22 15:28:19 -07:00

mtp

MTP: Include size of 12 byte header in packet size for GetObject data packet

2010-10-11 17:33:52 -04:00

tests

Merge fb474872 from gingerbread-plus-aosp

2010-10-18 08:33:38 -07:00