tree c4b15bb306c855aae379233ca97323434ba546bc
parent bb78b40d83b790a0e08d5587160a5138520bc402
parent b185a0e186fc172ba126746ca5d4b14c7f081814
author Alex Ruiz <alruiz@google.com> 1404251738 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404251738 +0000

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

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