aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantinos Menychtas <kmenychtas@google.com>2015-08-11 03:45:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-11 03:45:21 +0000
commit6750602374af63f543fa65f2e14b5a8cc318df54 (patch)
tree731e7293d6cf6cf7c7519678d3bab963c5885d97
parentb152c0e78f0193309be0c6673bc54f50a658cb4c (diff)
parent05185e0e9d2c5fc6bd381213ddfb374c7583ffb9 (diff)
downloadsdk-6750602374af63f543fa65f2e14b5a8cc318df54.zip
sdk-6750602374af63f543fa65f2e14b5a8cc318df54.tar.gz
sdk-6750602374af63f543fa65f2e14b5a8cc318df54.tar.bz2
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 '05185e0e9d2c5fc6bd381213ddfb374c7583ffb9': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
0 files changed, 0 insertions, 0 deletions