tree f4502e66236e89d762e7df50bc6bc1c713977753
parent 8a89e93ba40d6ce5534262f8dcd878817adfa08f
parent e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23
author Scott Main <smain@google.com> 1327543400 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327543400 -0800

am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1

* commit 'e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
  docs: remove the 1.0 icon template pack