tree dec52ffb67cf0adce596f2d7937c52e5dc9b87cd
parent bab1ac4e5d72bd23eabea86a434965071cd06ae6
parent 2e2de4303c89e98d12538f6eb86d12ed6e4bd729
author Kenny Root <kroot@google.com> 1403174352 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403174352 +0000

am 2e2de430: am f12b1d35: Merge "Move conversion from ISO-8859-1 to UTF8 after applying patches"

* commit '2e2de4303c89e98d12538f6eb86d12ed6e4bd729':
  Move conversion from ISO-8859-1 to UTF8 after applying patches