tree c98a9fb6c7c2b12468e7b94c8221d32ed9814945
parent 37b0da26fc898e75027a4df8219fb07376f8640f
parent ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed
author The Android Open Source Project <initial-contribution@android.com> 1274287400 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274287400 -0700

am ee1cdd0e: merge from open-source master

Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken

* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
  Don't allow invalid Uris to be added as observers.