tree 37b5b547bfbb15a47b7a5050012fdf82b9f8cbf8
parent 3be7b211b9fec77c039cfa6cdded33014e6ef82c
parent 49f98ce10dadcf529108ee070bc6d1e7ec3c6433
author Dirk Dougherty <nobody@android.com> 1243357901 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243357901 -0700

am 30d79f64: am f3043db0: AI 149251: Add 1.x Icon Guidelines doc and template pack.   BUG=1790234

Merge commit '30d79f64ecdd15d279cae6421f39a0c8fa2fab7d'

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