tree 6abe1596f1da1bed8c226c0636bbe36d8aa53563
parent 71b88c72b7de2ec4ab751be7020549a50d9f3499
parent 6974ba4ed430ec3247c3a5c04a2263b4b04ff827
author Elliott Hughes <enh@google.com> 1422995580 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422995580 +0000

am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."

* commit '6974ba4ed430ec3247c3a5c04a2263b4b04ff827':
  Add Google-style ReadFileToString and WriteStringToFile.