Eric Laurent bb7684bafa resolved conflicts for merge of ac4a284a to master ...

Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8

2010-09-23 12:22:44 -07:00

..

java/android

resolved conflicts for merge of ac4a284a to master

2010-09-23 12:22:44 -07:00

jni

resolved conflicts for merge of ac4a284a to master

2010-09-23 12:22:44 -07:00

libdrm

…

libeffects

am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread

2010-09-21 16:53:20 -07:00

libmedia

am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread

2010-09-17 23:25:37 -07:00

libmediaplayerservice

Implemented frequent read returns for quick stop in time lapse.

2010-09-17 09:50:27 -07:00

libstagefright

am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders

2010-09-23 10:28:21 -07:00

mediaserver

…

mtp

MTP: Fix typo that resulted in the MTP provider returning thumb format for object format

2010-09-20 18:29:59 -04:00

tests

resolved conflicts for merge of ac4a284a to master

2010-09-23 12:22:44 -07:00