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

Change-Id: I97671e62de26919e391dbb2686511584c59ab990

2014-10-02 11:48:08 +01:00

..

assets

…

jni

…

res

…

src/androidx/media/filterfw

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

2014-10-02 11:48:08 +01:00

tests

SmartCamera: Fix to build against latest camera2 api

2013-10-15 15:23:07 -07:00

.classpath

…

.project

…

Android.mk

Camera2: Hide all the deprecated methods and interfaces

2014-07-06 17:31:14 -07:00

AndroidManifest.xml

…

ic_launcher-web.png

…

proguard-project.txt

…

project.properties

…