summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-09-19 14:14:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-19 14:14:17 -0700
commita7dd66a4709353cd27b4482be73d2b3804cbeaa6 (patch)
treea6f1806000fbb8dee56656607c046355ea2b5dbd /tests
parent2e9a426529c54774b23609bee8d50118118ab895 (diff)
parent9fa4b7af7a853f31479a2b302d618cd3d832e2f2 (diff)
downloadframeworks_base-a7dd66a4709353cd27b4482be73d2b3804cbeaa6.zip
frameworks_base-a7dd66a4709353cd27b4482be73d2b3804cbeaa6.tar.gz
frameworks_base-a7dd66a4709353cd27b4482be73d2b3804cbeaa6.tar.bz2
am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev
* commit '9fa4b7af7a853f31479a2b302d618cd3d832e2f2': Camera2Tests: create new directory for manual camera2 test apps
Diffstat (limited to 'tests')
-rw-r--r--tests/Camera2Tests/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Camera2Tests/Android.mk b/tests/Camera2Tests/Android.mk
new file mode 100644
index 0000000..5053e7d
--- /dev/null
+++ b/tests/Camera2Tests/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)