commit dc952b9a042a4b18049de8c7ae13516820b565f2
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 13:44:30 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 13:44:30 2013 -0700
tree 96e26564bf7ea70729ec8584b0dca4bf6d4a2576
parent 5a478e277818def09b65a47a4d656cd24762bcf0
parent d61fe17fe45fb261534078d2fa8f2443ce5543f7

am d61fe17f: am e0faab0f: am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd61fe17fe45fb261534078d2fa8f2443ce5543f7':

Android.mk

diff --git a/Android.mk b/Android.mk
index a325a18..61625ac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
+
+ifeq (0,1)
 include $(CLEAR_VARS)
 
 #
@@ -34,8 +36,7 @@
 
 #include $(BUILD_PACKAGE)
 
-include $(CLEAR_VARS)
-
+endif
 
 ##################################################
 # Build all sub-directories