summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-09-20 09:58:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-20 09:58:48 -0700
commit52c77ea4d1f270d8f4f38081b2e74b1e90e74011 (patch)
treee2769cf3cd01355c531b3ecb9b6ceb0b72150f79 /tests
parent5380b780bb4f0839cd42ffe64cfb3b73857b6152 (diff)
parenta7dd66a4709353cd27b4482be73d2b3804cbeaa6 (diff)
downloadframeworks_base-52c77ea4d1f270d8f4f38081b2e74b1e90e74011.zip
frameworks_base-52c77ea4d1f270d8f4f38081b2e74b1e90e74011.tar.gz
frameworks_base-52c77ea4d1f270d8f4f38081b2e74b1e90e74011.tar.bz2
am a7dd66a4: am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev
* commit 'a7dd66a4709353cd27b4482be73d2b3804cbeaa6': 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)