tree 32b4bbe21a10d69cdbd0502137f4515f9b73f241
parent cbffba3f477e8f899bcdf0bd1380bc537327a98f
parent 9fa0698523b8a573b8862c0e62c533be8bd53bda
author Colin Cross <ccross@android.com> 1427823371 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427823371 +0000

am 9fa06985: Merge "Remove -encoding UTF-8, it is now the default"

* commit '9fa0698523b8a573b8862c0e62c533be8bd53bda':
  Remove -encoding UTF-8, it is now the default