tree c6bf51b51e8f481c7f49f7643ba6b70a267ca6ac
parent f56e9165d9ba2984dc2534c9c19bc33b48f17cab
parent 04be0d869acce82293b6c668f52bddf14c106908
author Jeff Hamilton <jham@android.com> 1276031112 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276031112 -0700

am 04be0d86: Set JAVA_HOME to point to java 1.5.

Merge commit '04be0d869acce82293b6c668f52bddf14c106908' into froyo-plus-aosp

* commit '04be0d869acce82293b6c668f52bddf14c106908':
  Set JAVA_HOME to point to java 1.5.