tree 579c22c0c9c2828775d36c7967747a29d4164a72
parent 7bc600cb08394e60eef984843976d4f79e5d94e8
parent 4a2b3ef1810135bea25a827d7c52767f50c528b6
author Chet Haase <chet@google.com> 1284754498 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284754498 -0700

am 4a2b3ef1: Merge "new assets" into gingerbread

Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp

* commit '4a2b3ef1810135bea25a827d7c52767f50c528b6':
  new assets