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

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

* commit 'c8e8bb666f166aa923c9f55d8fd627a1f7b957bb':