tree 722eb2c513fd914d08372413ebaddd2710182447
parent 9c9a3afb95dcac7bf356edf25c8d86187ea59afd
parent 3c3b780caea0bec62904a83f385f5a865fb259a7
author Rich Slogar <rslogar@google.com> 1424211228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424211228 +0000

am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs

* commit '3c3b780caea0bec62904a83f385f5a865fb259a7':
  docs: studio mipmap update