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