tree d16919d81d4d5c98315935df5cc2c47a41b418bd
parent 5c09d4b8d8121514c63bd0cf72035a03d9ae8776
parent 4ec024e960f82963265fc2ec435a1b7b7f5581db
author smain@google.com <smain@google.com> 1418023225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418023225 +0000

am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs

* commit '4ec024e960f82963265fc2ec435a1b7b7f5581db':
  add studio 1.0 files and reorder features list