John "Juce" Bruce 31aa8eea04 resolved conflicts for merge of 7eea20df to master ...

Change-Id: Ibd8b16745d36b24041856f315fbb09a6c25cf4fb

2014-04-02 18:59:05 -07:00

..

core

resolved conflicts for merge of 7eea20df to master

2014-04-02 18:59:05 -07:00

include

resolved conflicts for merge of 7eea20df to master

2014-04-02 18:59:05 -07:00

src

resolved conflicts for merge of 7eea20df to master

2014-04-02 18:59:05 -07:00

test

resolved conflicts for merge of 3db90f54 to master

2014-04-01 16:57:14 -07:00

Android.mk

Add Support for Audio MIME Types

2014-04-02 15:39:12 -07:00