tree 474bcc52d876c31bc5c1f9a79be6e10944d231b6
parent 14438b81a1fe4d7ebdf8977f3d80a1dd1867c5ad
parent dd8f9268415de539b9b17a9b7d24405b50d9c053
author Justin Ho <justinho@google.com> 1300410023 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300410023 -0700

am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1

* commit 'dd8f9268415de539b9b17a9b7d24405b50d9c053':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF