tree ba6de528a0b04b1767a1965cf329fd49f2e44b53
parent d795dcc5ead7328c1b3fcb14e279c4bec6a38b50
parent 9255ad4a4f46dc7781b180d0cffce2d616adebcf
author Dan Albert <danalbert@google.com> 1424906278 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424906278 +0000

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

* commit '9255ad4a4f46dc7781b180d0cffce2d616adebcf':
  Fix readx/writex names.