tree 1aa3e5551f601b5300a56b321d61179ba8f3651e
parent 378a159e85a570cfd174caf120f7193d9c8623c2
parent 928bade04c44400fa76b96323c7b8ece0630a5b0
author Rich Slogar <rslogar@google.com> 1430529734 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430529734 +0000

am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs

* commit '31e493277ada5dc72e6b0bf501fa649307bf6814':