tree 6e69fd665fbf0c1dadee86dcc6288fc5a2a7d659
parent d285664399f8f68750e75707a35046e3c9592a2d
parent 76dd6aa7f9d36183f44654eb45dc304abe8b7caf
author Rich Slogar <rslogar@google.com> 1424205764 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424205764 +0000

am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs

* commit '76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
  docs: studio revision 1-1