tree a97ed223d01cb0072c8ebf1871ae7d7357bb5664
parent d2788f8dabd6d51f278609cddc7a3a504f36cdd4
parent ee4e247d24496da615d0270146c0a058074badc5
author Neil Fuller <nfuller@google.com> 1448015151 +0000
committer android-build-merger <android-build-merger@google.com> 1448015151 +0000

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

* commit 'ee4e247d24496da615d0270146c0a058074badc5':
  Use sensible default locations for Java