tree e7be87f0b0f6813df7043f78578f40c6208fa5ac
parent efb6884c3640b4c5f1307b8d109cc740597c6cfb
parent 8466813637cf2b1f5f12f8524237aed6c95ad4e9
author Scott Main <smain@google.com> 1369086454 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369086454 -0700

am 84668136: Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev

* commit '8466813637cf2b1f5f12f8524237aed6c95ad4e9':
  delete obsolete duplicate files