tree 3ce298f98ea0ef577967d2a2e097078daf6fdde7
parent 3e89981293f3549d07a313c1b97ae0a11ea6dd2f
parent ec20a71b4629d869fd5d5155ffef980d42e1ed9d
author Colin Cross <ccross@android.com> 1501116888 +0000
committer android-build-merger <android-build-merger@google.com> 1501116888 +0000

Merge "Compile with javac by default" am: 262d597530 am: 6d6e0f7c75
am: ec20a71b46

Change-Id: If2dfb91709f8bdab7dc3e7634a7001d78de66e2d