tree ba6de528a0b04b1767a1965cf329fd49f2e44b53
parent 94cb7fdc45db013c0ad6b8edc536717c6eb812a8
parent eef962bfd90f11ef2f936e57270c85293af60e5f
author Dan Albert <danalbert@google.com> 1424906676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424906676 +0000

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

* commit 'eef962bfd90f11ef2f936e57270c85293af60e5f':
  Fix readx/writex names.