tree fbd0c367a6db1469811ea850c50c769a5479e1dd
parent 312215557e4a8b285d7346fb49a2b91270b493d7
parent efe15f7429bf235437587994c6c45fc8c4682fab
author Nicolas Geoffray <ngeoffray@google.com> 1456749053 +0000
committer android-build-merger <android-build-merger@google.com> 1456749053 +0000

Merge "Check LEGACY_USE_JAVA7 before using 1.8." am: 239783a7ff
am: efe15f7429

* commit 'efe15f7429bf235437587994c6c45fc8c4682fab':
  Check LEGACY_USE_JAVA7 before using 1.8.