tree 0e4201cb5399c2031ae337af4011ba4b028cf799
parent 6cd8878f50e267d464da904fcd6552caa9e2b40d
parent f4a2188a4ec02cf1b0ca09aa1a7c005fb9959005
author Dirk Dougherty <nobody@android.com> 1243539399 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243539399 -0700

am 1cb62b83: 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 '1cb62b83241c5d1cac9e9cda60d0d5d9218b44fb'

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