tree 4f3fc092ddcda468a9b8108eadd2819d0cb5b30e
parent 6b26de17a296dff8b992cce1932663ec4f1d74cd
parent 4beeee879af7581d6b3c28246a7cebe608f8e3a0
author Geremy Condra <gcondra@google.com> 1362179393 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362179393 -0800

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

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