diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-07 14:01:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 14:01:30 -0700 |
| commit | 992a9e507fb1f8da7358b4d805c034d934eb1810 (patch) | |
| tree | 5781ce72c7e5fb25171db706d1115f134eed14cc | |
| parent | c296f22e713257271f95c2115df9e13d05d5687a (diff) | |
| parent | fd124570ce647b3adc5dc30ce782d6e017dab4a2 (diff) | |
| download | frameworks_base-992a9e507fb1f8da7358b4d805c034d934eb1810.zip frameworks_base-992a9e507fb1f8da7358b4d805c034d934eb1810.tar.gz frameworks_base-992a9e507fb1f8da7358b4d805c034d934eb1810.tar.bz2 | |
am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp
* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
DropBox.Entry javadoc syntax fix
| -rw-r--r-- | core/java/android/os/DropBoxManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/DropBoxManager.java b/core/java/android/os/DropBoxManager.java index 23fdb0b..3db1915 100644 --- a/core/java/android/os/DropBoxManager.java +++ b/core/java/android/os/DropBoxManager.java @@ -152,7 +152,7 @@ public class DropBoxManager { /** @return time when the entry was originally created. */ public long getTimeMillis() { return mTimeMillis; } - /** @return flags describing the content returned by @{link #getInputStream()}. */ + /** @return flags describing the content returned by {@link #getInputStream()}. */ public int getFlags() { return mFlags & ~IS_GZIPPED; } // getInputStream() decompresses. /** |