aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantinos Menychtas <kmenychtas@google.com>2015-08-11 04:07:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-11 04:07:35 +0000
commit245b5ea56cb43b85169caf99fd488b0ac4b27641 (patch)
tree34a7c3088d8847d4dddb09ac19e2a6e0303feb4c
parentfd23b30d5dfaa17b34774de63230d22ca607b39b (diff)
parent2af77026e7d463da075813aed80babb18370d26a (diff)
downloadsdk-245b5ea56cb43b85169caf99fd488b0ac4b27641.zip
sdk-245b5ea56cb43b85169caf99fd488b0ac4b27641.tar.gz
sdk-245b5ea56cb43b85169caf99fd488b0ac4b27641.tar.bz2
am 2af77026: 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 '2af77026e7d463da075813aed80babb18370d26a': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
0 files changed, 0 insertions, 0 deletions