tree c4b15bb306c855aae379233ca97323434ba546bc
parent 680e9d886cb997aa5d1e2496113e78fff6cb084f
parent 93c192031375f7bffcb73622719f399c5b00956a
author Alex Ruiz <alruiz@google.com> 1404252035 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404252035 +0000

am 93c19203: am b185a0e1: Merge "Fixed bug where SDK created for android-L pointed to android-20 folder." into idea133 automerge: 97db606

* commit '93c192031375f7bffcb73622719f399c5b00956a':
  Fixed bug where SDK created for android-L pointed to android-20 folder.