tree b47d8f9f4dddc58ce39a9bef1e3e4c1d43fc5a43
parent da86c362ce2babedeade9c3a12022b654057371a
parent 14557ce870b026b5d3c2d75e10fcd925d70fa19f
author Colin Cross <ccross@android.com> 1501136354 +0000
committer android-build-merger <android-build-merger@google.com> 1501136354 +0000

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

Change-Id: I1ea143b961010a23c57e8926d9f1da9de2e49fff