diff options
| author | Ying Wang <wangying@google.com> | 2012-08-22 15:26:03 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-22 15:26:03 -0700 |
| commit | fd27c860abbf870f818fac47ac8715133d2eca13 (patch) | |
| tree | 723e957dea01d9fb790fb2d0ce2f0c6f25e6f20b | |
| parent | 92283bd55b240cdffaa8dcbe67ff8fcd06eacc65 (diff) | |
| parent | 05f1ab8ceee67b9e89f36a713e04509d6f6d8934 (diff) | |
| download | emma-fd27c860abbf870f818fac47ac8715133d2eca13.tar.gz | |
resolved conflicts for merge of 05f1ab8c to master
Change-Id: I2190d297463260ea39d9d427fdac81e5933c1e50
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -15,8 +15,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res -LOCAL_NO_EMMA_INSTRUMENT := true - LOCAL_SDK_VERSION := 8 include $(BUILD_STATIC_JAVA_LIBRARY) |