Conley Owens 644f36eab4 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" ...

* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style

2011-06-09 12:14:11 -07:00

..

java/android

Merge "Improved conversion accuracy of exif geotag data"

2011-04-29 09:48:10 -07:00

jni

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00

libdrm

Merge "Modified libdrm to support SuperH platform"

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

libeffects

Fix off-by-two and other bugs in the visualization code.

2010-10-27 10:23:59 -07:00

libmedia

am 2ba92c71: do not merge bug 3370834 Cherrypick from master

2011-01-26 14:05:18 -08:00

libmediaplayerservice

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00

libstagefright

am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

2011-06-09 12:14:11 -07:00

mediaserver

move native services under services/

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

tests

Remove unnecessary SkImageDecoder_libjpeg.cpp

2011-03-10 17:52:31 +08:00