tree f4adf391d289e80724e123eca7abe6bc7ef51043
parent efceffca3d19d8b66b6f5a7d32e8b1989bfba8e8
parent 4aaa292a38a4201146c37d04fa3d566ce1e17e54
author Geremy Condra <gcondra@google.com> 1362179661 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362179661 -0800

am 4aaa292a: am 160dd055: am 4beeee87: Revert "Remove support for duplicate file entries."

* commit '4aaa292a38a4201146c37d04fa3d566ce1e17e54':
  Revert "Remove support for duplicate file entries."