tree df09d7041817536a5fbdff6e768f4443fad1dcb5
parent 970bad677585b3cba1ff1b48db9040c2005bd907
parent 5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc
author Justin Ho <justinho@google.com> 1300409758 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300409758 -0700

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

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