am ee1cdd0e: merge from open-source master

Browse Source

Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken

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

...

This commit is contained in:

The Android Open Source Project 2010-05-19 09:43:20 -07:00 committed by Android Git Automerger

parent 240b23aafd 7f3af556d7

commit 7e8b8d4e9c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available