tree 72288cfa4442655730a7068dcb0cd5874c728c59
parent 9a7bf7ede4c979cd3b42314562a6da6aab5aa990
parent 3a2fc08ddcbc9ddec1fa65722515501a406afbf4
author Elliott Hughes <enh@google.com> 1408595698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408595698 +0000

am 3a2fc08d: am 10f5a420: Merge "HAVE_OPEN_MEMSTREAM is no longer used."

* commit '3a2fc08ddcbc9ddec1fa65722515501a406afbf4':
  HAVE_OPEN_MEMSTREAM is no longer used.