diff options
| author | Konstantinos Menychtas <kmenychtas@google.com> | 2015-08-11 02:53:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 02:53:28 +0000 |
| commit | 5a571de39e9d65971fe0eb10aeb7122cd90db72e (patch) | |
| tree | 4f71e9fbc853c2e7d02df78cf5b4b092537e18c7 | |
| parent | 4ea6a758063fbeb61a08a274796beec888596fce (diff) | |
| parent | 1a30e186adf9dfa4b226ee14d58fd09535a98d15 (diff) | |
| download | sdk-5a571de39e9d65971fe0eb10aeb7122cd90db72e.zip sdk-5a571de39e9d65971fe0eb10aeb7122cd90db72e.tar.gz sdk-5a571de39e9d65971fe0eb10aeb7122cd90db72e.tar.bz2 | |
am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp
* commit '1a30e186adf9dfa4b226ee14d58fd09535a98d15':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
0 files changed, 0 insertions, 0 deletions