tree d8bc74763a2ea20773d9dd7114a2aa5071563c21
parent 9a272228828a25798ca97b8a941f6a29a151427f
parent 5d1b97315763b8a8882b428885342e0cd2817050
author Dirk Dougherty <nobody@android.com> 1243357900 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243357900 -0700

am 5d1b9731: am 29eafdea: AI 149251: Add 1.x Icon Guidelines doc and template pack.   BUG=1790234

Merge commit '5d1b97315763b8a8882b428885342e0cd2817050'

* commit '5d1b97315763b8a8882b428885342e0cd2817050':
  AI 149251: Add 1.x Icon Guidelines doc and template pack.