resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev

Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
This commit is contained in:
Brian Carlstrom 2013-03-27 17:04:05 -07:00
commit 8c374054b3
1 changed files with 2 additions and 0 deletions

View File

@ -50,6 +50,8 @@ endif # LOCAL_BUILD_HOST_DEX
include $(BUILD_SYSTEM)/base_rules.mk
$(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g
java_alternative_checked_module :=
# The layers file allows you to enforce a layering between java packages.