resolve merge conflicts of 6e3c86c8ed to stage-aosp-master

BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
2018-07-11 11:56:34 +01:00
parent d7647c1b66 6e3c86c8ed
commit f8d22dec87
3 changed files with 4 additions and 0 deletions
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -121,4 +121,5 @@ java_library_static {
        },
    },
    sdk_version: "current",
+    compile_dex: true,
 }