diff options
| author | Xin Li <delphij@google.com> | 2017-12-06 11:52:25 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-12-06 14:24:59 -0800 |
| commit | e5aba25c43add3a91e2064ecc3d5403ce7e1f7bc (patch) | |
| tree | 37abba8e242d359b2ec697d0f8064ba963c5039b | |
| parent | 4753a23dd42f5ee3287dbbd9830010071b1bcf98 (diff) | |
| parent | 89a2e2d41dc165f6820cf242506d4d718447d5c6 (diff) | |
| download | contrib-e5aba25c43add3a91e2064ecc3d5403ce7e1f7bc.tar.gz | |
DO NOT MERGE: Merge Oreo MR1 into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I457f501115484af6ee75e846e981c6eac6d31959
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,6 +22,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_RESOURCE_DIRS := res LOCAL_JAVACFLAGS += -g -Xlint +-include tools/tradefederation/core/error_prone_rules.mk LOCAL_MODULE := tradefed-contrib |