tree 0121c14ed57828f93de19df1399baa1956f0ef60
parent 9c5c5a874a2453a9684ad56739f1a779f04e66db
parent 784aab786c9e6f84d6ae58655f32ce6b3ccfc33f
author Ricardo Cervera <rcervera@google.com> 1394814750 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394814750 +0000

am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs

* commit '784aab786c9e6f84d6ae58655f32ce6b3ccfc33f':
  docs: Added step to get JDK to the Android Studio install instructions.