tree 9e5b16ddbe3e2d4a83043b748228d362dab57124
parent f0970841bc634e689962091cf86ad5c7becb5285
parent 961949e054c7bb99777848dd8d10ba933bd41817
author David Turner <digit@android.com> 1302878351 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302878351 -0700

am 961949e0: am 2732ff2d: Merge "Moved IOStream.h to be used in external API for libOpenGLRender."

* commit '961949e054c7bb99777848dd8d10ba933bd41817':
  Moved IOStream.h to be used in external API for libOpenGLRender.