tree 84f4008411853da72b714d805dad2bf3e0618238
parent 5cb72178220277c53b61fbc06c80781d3780d104
parent 6d6e0f7c75a34b3b4f0f673900ad923b82f8e866
author Colin Cross <ccross@android.com> 1501115440 +0000
committer android-build-merger <android-build-merger@google.com> 1501115440 +0000

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

Change-Id: Ie7581b944c0a6aae54103d07cd81c08e301c8c7e