Dan Willemsen 5f551b3fdc resolve merge conflicts of 20d55a7 to stage-aosp-master ...

Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59

2016-06-16 09:54:28 -07:00

..

assets

…

jni

resolve merge conflicts of 20d55a7 to stage-aosp-master

2016-06-16 09:54:28 -07:00

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

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

…