tree 0756b09b6296185b4af46613f1653cb0e240f2bc
parent 2740233048452a10f5eebd0117e7c598faa65c80
parent 6de1fd98f73b94c8bd5508b3e3d419d0b5d19621
author Rich Slogar <rslogar@google.com> 1424219116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424219116 +0000

am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989

* commit '6de1fd98f73b94c8bd5508b3e3d419d0b5d19621':
  docs: site mipmap folder updates