tree 7164933ddeaf3f90570726f5a2e331816ccccd93
parent ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac
parent 19c06156b6615ba53d81d2ecdc341c3feea21662
author Ying Wang <wangying@google.com> 1346895595 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346895595 -0700

am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"

* commit '19c06156b6615ba53d81d2ecdc341c3feea21662':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES