diff options
| author | Konstantinos Menychtas <kmenychtas@google.com> | 2015-08-11 03:33:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 03:33:53 +0000 |
| commit | 05185e0e9d2c5fc6bd381213ddfb374c7583ffb9 (patch) | |
| tree | 47b2667a062cbccd0c814b9f8f0c2ee65ec25ed7 | |
| parent | 3a4699ee8d39659a548d40990e89fdf9eb63bf1a (diff) | |
| parent | 48812401e56622fccb2116e381df8e41baaa1400 (diff) | |
| download | sdk-05185e0e9d2c5fc6bd381213ddfb374c7583ffb9.zip sdk-05185e0e9d2c5fc6bd381213ddfb374c7583ffb9.tar.gz sdk-05185e0e9d2c5fc6bd381213ddfb374c7583ffb9.tar.bz2 | |
am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp
* commit '48812401e56622fccb2116e381df8e41baaa1400':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
0 files changed, 0 insertions, 0 deletions