tree 51db11f9ad7cb585f8b27afda89c4695926b84e7
parent 739ce549aea43ffefeefbf742282736462921b1a
parent 02e0f6c1dbe5f499f9797c08208c7276af7553e6
author Colin Cross <ccross@android.com> 1501136047 +0000
committer android-build-merger <android-build-merger@google.com> 1501136047 +0000

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

Change-Id: I8455ff91c8e9c0a81e26f438d198feccd1ab237a