tree a271653ec2eaa18d9faa8a19b963148c9b755700
parent d290ad47a2073baf2a1a72a8f129e73ca18738c6
parent fec880df27adeb901a0e936e7bf3f944d8b95cb7
author Dirk Dougherty <nobody@android.com> 1243539033 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243539033 -0700

am 2542c0a8: AI 149346: Replace icon_templates-v1.0.zip with new archive from cnesladek. remove mac-specific files, fix dir name, repack.   BUG=1877969

Merge commit '2542c0a805b144b4c4324a749574d9ba76660557' into donut

* commit '2542c0a805b144b4c4324a749574d9ba76660557':
  AI 149346: Replace icon_templates-v1.0.zip with new archive from cnesladek. remove mac-specific files, fix dir name, repack.