commit | c78d07c6e964f23dc12ba739aff49ff1bf74b323 | [log] [tgz] |
---|---|---|
author | Konstantinos Menychtas <kmenychtas@google.com> | Tue Aug 11 04:35:26 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 04:35:26 2015 +0000 |
tree | 6ee608df2213f6f5c5a7cb25128a870608b5f32b | |
parent | 3c9c2be94a1b36a7e01c9011966137badee8b843 [diff] | |
parent | 61f99f13140701092d7b6a49d3d26e454f463d8d [diff] |
am 61f99f13: am 245b5ea5: 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 '61f99f13140701092d7b6a49d3d26e454f463d8d': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer