tree 59ae2725dd3e1d2488a0922d4edb534e8e95db3e
parent 733ba8f0e473b214e55e3b93ded7739c35d85b10
parent 8f354bc8c2d4c27d93c7e13a853e0c9088d6ba94
author Neil Fuller <nfuller@google.com> 1448014813 +0000
committer android-build-merger <android-build-merger@google.com> 1448014813 +0000

Merge "Use sensible default locations for Java"
am: 8f354bc8c2

* commit '8f354bc8c2d4c27d93c7e13a853e0c9088d6ba94':
  Use sensible default locations for Java