tree 2bf9e8bb4d1cb65f933788772f69c1f15523bb87
parent 2b2d3a3f425e6ef9148e7c68ddef873dfde85614
parent 29d417284b8fc98f4c25aa90d167c00ccde82514
author Jean-Baptiste Queru <jbq@google.com> 1330010952 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330010952 -0800

am 29d41728: am 85a7a529: Merge "Documentation: add JDK configuration note"

* commit '29d417284b8fc98f4c25aa90d167c00ccde82514':
  Documentation: add JDK configuration note