tree ca271d6324fa0ed91c5698e5670a56914c49b46d
parent f0a7b0db2d5fcc519c58cd348f24a3c3c034a2e9
parent 381f64165153bfd4747b99baf838fa280d402d5e
author Dan Albert <danalbert@google.com> 1424907168 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424907168 +0000

am 381f6416: am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."

* commit '381f64165153bfd4747b99baf838fa280d402d5e':
  Fix readx/writex names.