tree 34a7c3088d8847d4dddb09ac19e2a6e0303feb4c
parent fd23b30d5dfaa17b34774de63230d22ca607b39b
parent 2af77026e7d463da075813aed80babb18370d26a
author Konstantinos Menychtas <kmenychtas@google.com> 1439266055 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439266055 +0000

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