am 5392556b: Merge change I5910a70c into eclair

Merge commit '5392556b65261b5da86301d9b038a12cf70e6197' into eclair-plus-aosp

* commit '5392556b65261b5da86301d9b038a12cf70e6197':
  Fix documentation.

core/java/android/provider/LiveFolders.java

@@ -45,7 +45,6 @@ import android.annotation.SdkConstant;
  * public static class MyLiveFolder extends Activity {
  *     public static final Uri CONTENT_URI = Uri.parse("content://my.app/live");
  *
- *     @Override
  *     protected void onCreate(Bundle savedInstanceState) {
  *         super.onCreate(savedInstanceState);
  *