| commit | 1c365aff6aac5a0d56d14b69371a720d5b6e57fd | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Mon Apr 15 05:56:01 2013 -0700 |
| committer | The Android Automerger <android-build@android.com> | Mon Apr 15 05:56:01 2013 -0700 |
| tree | e280bc42ff37a691096a0d637989469f7b2cae74 | |
| parent | 827e137bb168a6cd77011e7a66a2a4250e25d800 [diff] | |
| parent | e3dba7294ec66f7ec50e8fa8c8d4c9c1f2521236 [diff] |
merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/tests/camera2/Android.mk b/tests/camera2/Android.mk index b2ec41c..8f2278a 100644 --- a/tests/camera2/Android.mk +++ b/tests/camera2/Android.mk
@@ -46,4 +46,4 @@ LOCAL_MODULE:= camera2_test LOCAL_MODULE_TAGS := tests -include $(BUILD_EXECUTABLE) +include $(BUILD_NATIVE_TEST)