tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent a4fda50a9259368a3770f41c550fdd39530bec49
parent 278a730b839f98189f3c70cc2a0c2726b94e27f2
author Scott Main <smain@google.com> 1327543242 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327543242 -0800

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

* commit '9ac4dd828065410efbb380992d996c7e93daf437':
  docs: remove the 1.0 icon template pack