aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantinos Menychtas <kmenychtas@google.com>2015-08-11 03:17:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-11 03:17:47 +0000
commit7f23b1d0dfa045d23b3931a32fd4df2e7f0eef88 (patch)
tree91e9e7227cc1a79a08edd6f742a918628b08d994
parent50f3a08874bc8794159395dcdcc71e144b03bba9 (diff)
parenta8f117d38948aa6fba09e3391fb6afdf16f50b14 (diff)
downloadsdk-7f23b1d0dfa045d23b3931a32fd4df2e7f0eef88.zip
sdk-7f23b1d0dfa045d23b3931a32fd4df2e7f0eef88.tar.gz
sdk-7f23b1d0dfa045d23b3931a32fd4df2e7f0eef88.tar.bz2
am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp
* commit 'a8f117d38948aa6fba09e3391fb6afdf16f50b14': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
0 files changed, 0 insertions, 0 deletions