Glenn Kasten 29427a224e am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." ...

* commit 'a0e300efae92d8155151e345034620054cff8955':
  mediaeditor shouldn't depend on audioflinger.

2014-03-19 21:22:09 +00:00

..

java/android

am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev

2014-03-19 20:52:03 +00:00

jni

am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."

2014-03-19 21:22:09 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Remove deprecated BufferQueue constructor

2014-03-12 17:02:07 -07:00

tests

Update framework to use M33 Skia. DO NOT MERGE

2014-03-17 13:57:18 +00:00