tree 0fd26330ffeb59c9a29f6e1c0c28780ea49d1114
parent 895ab42ffd3201584e0cb74d73ba10ee4fb59e13
parent 2cfdbf5f7f087c1d214e51e6daf7193234cd19ee
author smain@google.com <smain@google.com> 1418033585 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418033585 +0000

am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs

* commit '2cfdbf5f7f087c1d214e51e6daf7193234cd19ee':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268