diff options
| author | Konstantinos Menychtas <kmenychtas@google.com> | 2015-08-11 03:52:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 03:52:55 +0000 |
| commit | 2af77026e7d463da075813aed80babb18370d26a (patch) | |
| tree | a4d7d5ac34e2492dc17a0b47d8e61ea688e970d7 | |
| parent | 919b6c2bbe5c20514ff37ffd8c0a1e7e961ac176 (diff) | |
| parent | 6750602374af63f543fa65f2e14b5a8cc318df54 (diff) | |
| download | sdk-2af77026e7d463da075813aed80babb18370d26a.zip sdk-2af77026e7d463da075813aed80babb18370d26a.tar.gz sdk-2af77026e7d463da075813aed80babb18370d26a.tar.bz2 | |
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 '6750602374af63f543fa65f2e14b5a8cc318df54':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
0 files changed, 0 insertions, 0 deletions