tree 64c475eeeb593845bbd1475704f62b4b4eb4b843
parent 51e2f92a86c769949df816944fbe460ff4871862
parent 36d88e483ea531c702d018ceb67d316cb59c9f72
author Geremy Condra <gcondra@google.com> 1362517780 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517780 -0800

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

* commit '36d88e483ea531c702d018ceb67d316cb59c9f72':