am 8bf4e52c: (-s ours) Reconcile with klp-release - do not merge

* commit '8bf4e52cdfc3b9a8101d5945124fb7c4fd92c84e':
  Return NO_MEMORY when glReadPixels() fails.
This commit is contained in:
The Android Open Source Project 2013-08-14 15:14:38 -07:00 committed by Android Git Automerger
commit 6d92b74034

Diff Content Not Available