tree de4cbb4101835bde3cc59866824bcd5f676b76f6
parent 9dbf86ac6e32318742f65354680ebc1d94217d92
parent b6cb93cfb62e26168298b6f6e606af379350b064
author John Reck <jreck@android.com> 1359573722 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359573722 -0800

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

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