tree e3bbec6980210e79fa19347956843c9d4ae9edba
parent 80243449543e034d99da14f068dac609d1a8aa3e
parent 4cedfe9c8ef53702e599653d65913f8c8bf896f5
author Adam Cohen <adamcohen@google.com> 1317094857 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317094857 -0700

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

* commit '4cedfe9c8ef53702e599653d65913f8c8bf896f5':
  A few new launcher assets