tree 6993687d0c39d4fe3303d40166c0ad7450e9e969
parent 240b23aafdfd04fe58767a09c56df123c66beefc
parent 7f3af556d721d1bc7d52064bfd32dd44c2338fc2
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.