Andreas Huber a4a2a3aaef am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread ...

Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'

* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.

2010-10-15 08:33:23 -07:00

..

java/android

resolved conflicts for merge of a127c07c to master

2010-10-14 23:58:41 -07:00

jni

MTP: allow renaming directories

2010-10-12 14:19:51 -04: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

am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread

2010-10-15 08:33:23 -07:00

libmediaplayerservice

resolved conflicts for merge of a127c07c to master

2010-10-14 23:58:41 -07:00

libstagefright

am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread

2010-10-15 08:32:06 -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

am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.

2010-10-06 17:07:49 -07:00