James Dong c5eeedc93d am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread ...

Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5'

* commit '9049fe60c20640bd606741c8f45f3f781a1684f5':
  Progress status notification

2010-07-20 16:55:12 -07:00

..

java/android

Add MTP_OBJECT_ID column name to MediaStore.MediaColumns

2010-07-19 09:51:56 -04:00

jni

Exclude MTP implementation from simulator build

2010-07-15 15:27:38 -04:00

libdrm

Merge "Modified libdrm to support SuperH platform"

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

libeffects

resolved conflicts for merge of dd206093 to master

2010-07-20 13:37:19 -07:00

libmedia

resolved conflicts for merge of dd206093 to master

2010-07-20 13:37:19 -07:00

libmediaplayerservice

am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread

2010-07-20 16:55:12 -07:00

libstagefright

am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread

2010-07-20 16:55:12 -07:00

mediaserver

move native services under services/

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

mtp

Merge "MTP host fixes:"

2010-07-20 09:06:41 -07:00

tests

am 7b3f3048: am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread

2010-07-07 15:00:22 -07:00