tree b2d634f81f73e7956e1a64326b758262a86aef14
parent 8e142bbbe19c2f485033eace102d2e950ceeb4fb
parent 8714a3437e13b4a403e49c4c624f272dd6dc8f4e
author Ricardo Cervera <rcervera@google.com> 1394814502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394814502 +0000

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

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