Commit 48812401 authored by Konstantinos Menychtas's avatar Konstantinos Menychtas Committed by Android Git Automerger
Browse files

am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved... 

am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp

* commit '7f23b1d0':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
parents 4aaaae0d 7f23b1d0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment