tree 60ce37ef352a7f8ed67ae1a3b78a8911e31d23c1
parent 8b4a58e1dfd8a1f59a7c436954028449a86a0d4e
parent fa41212789a068827edc9fd1eac7b6a988cba0a5
author Piotr Jastrzebski <haaawk@google.com> 1407924143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407924143 +0000

am fa412127: am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""

* commit 'fa41212789a068827edc9fd1eac7b6a988cba0a5':
  Revert "Make sure that names of all entries have the same encoding."