Neil Fuller c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp ...

Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7

2014-10-02 14:32:37 +01:00

..

assets

…

jni

…

res

…

src/androidx/media/filterfw

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

tests

…

.classpath

…

.project

…

Android.mk

…

AndroidManifest.xml

…

ic_launcher-web.png

…

proguard-project.txt

…

project.properties

…