| commit | a191eb5d45e49ec1f7333f16be9ce12f7ef0b9e1 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Sun Apr 14 18:36:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 14 18:36:59 2013 -0700 |
| tree | 04d9a0b8a115afe9edf43861492c19943db8b46c | |
| parent | e982ae247dda3de86e1640d37735363f0a6645c5 [diff] | |
| parent | 45ec469f2d9b323ed0ba784069888bc40d63cbbe [diff] |
am 45ec469f: am 7455393a: Merge "Update the test output path." into jb-mr2-dev * commit '45ec469f2d9b323ed0ba784069888bc40d63cbbe': Update the test output path.
diff --git a/camera/tests/Android.mk b/camera/tests/Android.mk index e455943..ec13911 100644 --- a/camera/tests/Android.mk +++ b/camera/tests/Android.mk
@@ -35,4 +35,4 @@ LOCAL_MODULE:= camera_client_test LOCAL_MODULE_TAGS := tests -include $(BUILD_EXECUTABLE) +include $(BUILD_NATIVE_TEST)