tree 73b5e065ca2ac32a47acf6ab1c7dd1cff9a8d0e0
parent 14bb9188bfd001bbb96749e51b8d5edc242c89e7
parent b87aa6cb96341ab32d21f5340f1064fcaa607920
author Rich Slogar <rslogar@google.com> 1424372361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424372361 +0000

am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs

* commit 'b87aa6cb96341ab32d21f5340f1064fcaa607920':
  docs: mipmap link updates