tree e3bbec6980210e79fa19347956843c9d4ae9edba
parent dc294231bd0c218eabb47b291abdb5931b733137
parent 7493db6c2f1c74729aee396d68e0872ddcc82fad
author Adam Cohen <adamcohen@google.com> 1317095089 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317095089 -0700

am 7493db6c: am 4cedfe9c: Merge "A few new launcher assets" into ics-factoryrom

* commit '7493db6c2f1c74729aee396d68e0872ddcc82fad':
  A few new launcher assets