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