summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* audio: Support for mxmf file playbackcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Amit Shekhar2014-05-061-2/+8
* Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-011-2/+1
|\
| * remove include of utils/Log.hColin Cross2013-07-241-2/+1
* | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-241-2/+5
|\ \ | |/
| * am 4a213147: am 274d0571: Merge "Added support for parsing XMF versions 1.00 ...Jean-Baptiste Queru2012-09-061-17/+28
| |\ | |/ |/|
* | am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 head...cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1Jean-Baptiste Queru2012-09-061-17/+28
|\ \
| * \ Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"Jean-Baptiste Queru2012-09-061-17/+28
| |\ \
| | * | Added support for parsing XMF versions 1.00 and 1.01 headersAndreas Lillvik2012-09-061-17/+28
| |/ /
| | * am 0eb1fab7: am 09a0c670: Merge "There is fd leak in sonivox lib when try ope...Jean-Baptiste Queru2012-08-151-1/+12
| | |\ | |_|/ |/| |
* | | am 09a0c670: Merge "There is fd leak in sonivox lib when try open any media f...Jean-Baptiste Queru2012-08-151-1/+12
|\ \ \ | |/ /
| * | Merge "There is fd leak in sonivox lib when try open any media file > 2GB (MI...Jean-Baptiste Queru2012-08-151-1/+12
| |\ \
| | * | There is fd leak in sonivox lib when try open any media filegbhakteX2012-08-141-1/+12
| |/ /
| | * Split out LOCAL_ASFLAGSYing Wang2012-08-101-2/+5
| |/ |/|
* | Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-9/+0
|/
* Fix crash when scanning corrupt midi file.jellybean-stablejellybeanMarco Nelissen2011-12-161-0/+5
* am d868ec62: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\
| * Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\
| | * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\
| | | * am d029b237: Remove unused file.Dan Bornstein2011-01-290-0/+0
| | | |\ | | |/ /
* | | | am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
|\ \ \ \ | |/ / /
| * | | am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
| |\ \ \
| | * \ \ am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-210-0/+0
| | |\ \ \
| | | * \ \ merge from gingerbreadThe Android Open Source Project2011-01-211-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | am 7eaac433: am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | am d029b237: Remove unused file.Dan Bornstein2011-01-211-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Remove unused file.cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Dan Bornstein2011-01-211-0/+0
* | | | am bc636d8f: (-s ours) Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-210-0/+0
|\ \ \ \ | |/ / /
| * | | Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-211-0/+0
|/ / /
* | | Fix engine state reporting.Marco Nelissen2010-12-221-2/+2
* | | Add missing NOTICE files.David Deephanphongs2010-10-191-0/+14
|/ /
* | am 91f74c00: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
|\ \ | |/
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
* | merge from open-source masterThe Android Open Source Project2010-07-091-1/+1
|\ \ | |/ |/|
| * Fix missing NLBruce Beare2010-06-251-1/+1
|/
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-091-0/+49
* am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | | |\ | | |/ /
| | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
* | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| |\ \ |/ / /
| * | merge from eclairJean-Baptiste Queru2009-11-15252-132823/+132829
| |\ \ | | |/
| | * eclair snapshotJean-Baptiste Queru2009-11-13252-132823/+132829
* | | Fix infinite loop issue with correctly formed, but useless iMelody files (bug...Dave Sparks2009-08-262-3/+9
* | | Sonivox whitespace cleanupDave Sparks2009-08-25252-132823/+132823
|/ /
* | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \
| * \ Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-268-0/+1
| |\ \ | | |/
* | | Merge commit 'goog/readonly-korg-master' into merge_korg_masterJean-Baptiste Queru2009-07-150-0/+0
|\ \ \ | |/ /