tree cafc00670911caca00d26f0f2048a2ee8b5afa09
parent 37e8286256e5fce9a26d1872a0636e0f4a72abaf
parent 83d83cb42afab8a9629138cc3199ad5aa7849bd2
author Justin Ho <justinho@google.com> 1300152343 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300152343 -0700

am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1

* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets