OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
[android-x86/system-media.git] / CleanSpec.mk
2012-05-08 Jean-Baptiste Queruam 7a789817: (-s ours) Merge "Fixed runtime linkage...
2012-04-03 Mike LockwoodMerge remote-tracking branch 'goog/ics-aah'
2012-03-28 The Android Automergermerge in jb-release history after reset to master
2012-03-28 Eino-Ville TalvalaCleanup: Remove filterfw.jar from devices.
2012-03-27 Marius RennMerge "Multi-Project Commit: Move of filterfw out of...
2012-03-27 Marius RennMulti-Project Commit: Move of filterfw out of system...
2011-08-30 Wei HuaMerge "Add fillblack option"
2011-08-24 Glenn KastenMerge "Bug 5153313 keep compatibility of local files...
2011-08-24 Glenn KastenMerge "Bug 5105712 synchronous callbacks"
2011-08-24 Eric LaurentMerge "Converted libaudioutils implementation to C."
2011-08-23 Eric LaurentConverted libaudioutils implementation to C.
2011-07-15 Jean-Baptiste Queruam 91a9a6b1: Merge 94849a18
2011-07-15 Jean-Baptiste QueruMerge 94849a18
2011-07-03 Eddy TalvalaMerge "SyncRunner now respects the state of the GLEnvir...
2011-07-01 Marius RennMerge "Bugfixes to image filters."
2011-07-01 Eino-Ville TalvalaRework mobile filter framework build rules to support...
2011-03-17 Jean-Michel Triviresolved conflicts for merge of c5dcfeb2 to master
2011-03-17 Jean-Michel TriviMerge "Bug 4106199 Split libOpenSLES.so & libOpenMAXAL...
2011-03-17 Glenn KastenBug 4106199 Split libOpenSLES.so & libOpenMAXAL.so
2010-08-17 Yu Shan Emily LauMerge "Re-org the bufferQueue unit tests." into gingerbread
2010-08-16 Jean-Baptiste Queruam 2b94d1ef: Add CleanSpec.mk
2010-08-13 Jean-Baptiste QueruAdd CleanSpec.mk