Andreas Huber 26d9b9870e am 42556025: am 6dea6f4e: am 16263d9f: Squashed commit of the following: ...

Merge commit '425560259c6d41e7f413fdd0f517dc47f350c533'

* commit '425560259c6d41e7f413fdd0f517dc47f350c533':
  Squashed commit of the following:

2010-07-29 11:15:09 -07:00

..

java/android

resolved conflicts for merge of d306cc81 to master

2010-07-27 02:41:41 -07:00

jni

am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread

2010-07-28 07:53:24 -07:00

libdrm

…

libeffects

am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread

2010-07-28 07:53:24 -07:00

libmedia

am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread

2010-07-28 07:53:24 -07:00

libmediaplayerservice

am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread

2010-07-28 12:02:59 -07:00

libstagefright

am 42556025: am 6dea6f4e: am 16263d9f: Squashed commit of the following:

2010-07-29 11:15:09 -07:00

mediaserver

move native services under services/

2010-07-14 17:59:35 -07:00

mtp

MTP host: Reduce buffer size for readObject so we don't clog our pipe.

2010-07-27 12:38:33 -04:00

tests

CameraBrowser: Launch itself when a camera is attached to USB.

2010-07-27 19:20:31 -04:00