| commit | f6cbbbc050f57acefaa591b83fbc5b2e2bb3e694 | [log] [tgz] |
|---|---|---|
| author | Michael Kolb <kolby@google.com> | Fri Feb 15 07:45:11 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 15 07:45:11 2013 -0800 |
| tree | 09ab2cf0a0dc7e828d7f764b5033ec00ecf5288e | |
| parent | d66165b6baff308d4ad92c170bd6ae2f77af8c04 [diff] | |
| parent | a54931e070a9134cf0a8d16cc628997844fc93dc [diff] |
am a54931e0: Merge "New capture animation" into gb-ub-photos-bryce * commit 'a54931e070a9134cf0a8d16cc628997844fc93dc': New capture animation
diff --git a/tests_camera/Android.mk b/tests_camera/Android.mk index f39533a..81ea50d 100644 --- a/tests_camera/Android.mk +++ b/tests_camera/Android.mk
@@ -1,3 +1,4 @@ +ifeq (0,1) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -14,3 +15,4 @@ LOCAL_INSTRUMENTATION_FOR := Gallery2 include $(BUILD_PACKAGE) +endif