tree 80a8b36989da171e4cc22384abfdbc44c255f1eb
parent 308dfd2dfccc78a73ababf1f256b20e9cd35875e
parent 97df262f2fd351a399bc757d3f7e7c7bb3b00065
author John Reck <jreck@android.com> 1359576598 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359576598 -0800

am 97df262f: am b6cb93cf: am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"

# By dvshkurk
# Via Android Git Automerger (2) and others
* commit '97df262f2fd351a399bc757d3f7e7c7bb3b00065':
  Avoid members with the same base name in ar's archives