tree 12283462dbf86ce6f21d9a4d5e7757639be0e371
parent 8d5b2c4f2f0184c432b9879eb0af6c32381d4c08
parent c77a20a9d6ab56e79276215d8d1492a9893c9b59
author The Android Open Source Project <initial-contribution@android.com> 1273691598 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273691598 -0700

am fb234bbe: merge from open-source master

Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken

* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
  Notify user regarding invalid number during MO call.
  Build software AGL library with correct get_tls() macro for ARMv7 based platforms
  Fix glReadPixels() to verify that both x and y are non-negative.