summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-12 12:13:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 12:13:18 -0700
commit55bef14f153c1a80006de2ff86bcf67984a6e1a8 (patch)
tree6416e431f8b723833df2f6e796c1f806fb5d0954 /services
parente46defea3ae15787aa6afbb91cb9dc83d4a074e4 (diff)
parentfb234bbe5e7cbae42b4fc8f4ab353ba561599db2 (diff)
downloadframeworks_base-55bef14f153c1a80006de2ff86bcf67984a6e1a8.zip
frameworks_base-55bef14f153c1a80006de2ff86bcf67984a6e1a8.tar.gz
frameworks_base-55bef14f153c1a80006de2ff86bcf67984a6e1a8.tar.bz2
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.
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions