tree 6ee608df2213f6f5c5a7cb25128a870608b5f32b
parent df9c8e86eaa4ecc8793a8a25c82ed962bd27c16d
parent 245b5ea56cb43b85169caf99fd488b0ac4b27641
author Konstantinos Menychtas <kmenychtas@google.com> 1439267061 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439267061 +0000

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 '245b5ea56cb43b85169caf99fd488b0ac4b27641':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer