| commit | 45ec469f2d9b323ed0ba784069888bc40d63cbbe | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Sun Apr 14 18:33:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 14 18:33:28 2013 -0700 |
| tree | b47bc8e5cb3a6c3ea1c64ab0ec10b30485daf91f | |
| parent | 1d9c4125c460025725fb26e435d1e88761991ffe [diff] | |
| parent | 7455393a82bea99b88740365bc6612cbcac1a14a [diff] |
am 7455393a: Merge "Update the test output path." into jb-mr2-dev * commit '7455393a82bea99b88740365bc6612cbcac1a14a': 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)