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