tree 55f14758d30a9c1e7fa3015c665822bb1363e950
parent 4ed940caf71ded2cec4905a5e174657e33c29615
parent c78d07c6e964f23dc12ba739aff49ff1bf74b323
author Konstantinos Menychtas <kmenychtas@google.com> 1439269124 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439269124 +0000

am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp

* commit 'c78d07c6e964f23dc12ba739aff49ff1bf74b323':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer