tree 7bbca92045704eff9bb84c0768527dd3bdbef015
parent c34aa09914eb44ca017757bc71a4d7a34e65a643
parent 963a68d9277eb4975bd888f6359bd783670a4753
author Colin Cross <ccross@android.com> 1501136620 +0000
committer android-build-merger <android-build-merger@google.com> 1501136620 +0000

Merge "Revert "Compile with javac by default"" am: 9143549df7 am: 02e0f6c1db am: 14557ce870
am: 963a68d927

Change-Id: I71135a212dea2141a501fb68f36514493952df90