tree 2b2a3f7371fba4ce7a66068ac109353e17d1887f
parent c51f33d22929dc599611349979d305c5854b8f85
parent a1226563961af54d8c70422c412fc8f5436fae2b
author Colin Cross <ccross@android.com> 1427823806 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427823806 +0000

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

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