tree 6d9742bd92769ff3760a727a8df440ba31e27af6
parent 6cde3c1060609108b26ee347095fbb4c5fbbb153
parent 05f3cf42fd78d8d94dbfeb70f2331f85224d4e6c
author Geremy Condra <gcondra@google.com> 1362517960 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362517960 +0000

am 05f3cf42: am c8e8bb66: am b6733c9a: am 9799c2a0: am e68c13c0: am 300cde36: Merge "Remove support for duplicate file entries." into jb-dev

* commit '05f3cf42fd78d8d94dbfeb70f2331f85224d4e6c':