tree 12ffc0f3be490d155d51ee7a17223c3c2db33dbc
parent 6194a7ceade6d8c84e7d6ff1305285a1accf4ac5
parent ca54c6c24eed5afc8992282dfedc52ddef2154b0
author Colin Cross <ccross@android.com> 1487486153 +0000
committer android-build-merger <android-build-merger@google.com> 1487486153 +0000

Merge "Disable building coverage with javac" am: 271b1f6521 am: 2f23c5caf7
am: ca54c6c24e

Change-Id: I7ac8dbab285f189262a57c5173c71370eb8ef100