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

am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401:... 

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 '61f99f13':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
parents 3c9c2be9 61f99f13
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