am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo

Merge commit '1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken

* commit '1f5e847350ef1aece046666e20e7692a1651d9dc':
  Comment-only change to add documentation for FileObserver