diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:43:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 09:43:20 -0700 |
commit | b32a74c73b1433a3613419e61c05f6ff8efb5b41 (patch) | |
tree | c98a9fb6c7c2b12468e7b94c8221d32ed9814945 /opengl | |
parent | 37b0da26fc898e75027a4df8219fb07376f8640f (diff) | |
parent | ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed (diff) | |
download | frameworks_base-b32a74c73b1433a3613419e61c05f6ff8efb5b41.zip frameworks_base-b32a74c73b1433a3613419e61c05f6ff8efb5b41.tar.gz frameworks_base-b32a74c73b1433a3613419e61c05f6ff8efb5b41.tar.bz2 |
am ee1cdd0e: merge from open-source master
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken
* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
Don't allow invalid Uris to be added as observers.
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions