| commit | e5aba25c43add3a91e2064ecc3d5403ce7e1f7bc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Dec 06 11:52:25 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Wed Dec 06 14:24:59 2017 -0800 |
| tree | 37abba8e242d359b2ec697d0f8064ba963c5039b | |
| parent | 4753a23dd42f5ee3287dbbd9830010071b1bcf98 [diff] | |
| parent | 89a2e2d41dc165f6820cf242506d4d718447d5c6 [diff] |
DO NOT MERGE: Merge Oreo MR1 into master Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I457f501115484af6ee75e846e981c6eac6d31959
diff --git a/Android.mk b/Android.mk index 744e0a0..afc2ddf 100644 --- a/Android.mk +++ b/Android.mk
@@ -22,6 +22,7 @@ LOCAL_JAVA_RESOURCE_DIRS := res LOCAL_JAVACFLAGS += -g -Xlint +-include tools/tradefederation/core/error_prone_rules.mk LOCAL_MODULE := tradefed-contrib