diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-09 00:14:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 00:14:54 +0000 |
| commit | 0761b1b5ebb453a411e3289c1c972dbfddcee880 (patch) | |
| tree | 89fd89ca411db94e8153296d495e28ea5609176b /core/java/android/provider | |
| parent | 985d59d7e3e676a02892b2a5e131510a993b3449 (diff) | |
| parent | 89b196958fee07475765bd3c458098464ba16f2e (diff) | |
| download | frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.zip frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.tar.gz frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.tar.bz2 | |
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index d137f0c..736ec54 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -256,7 +256,7 @@ public final class MediaStore { * object in the extra field. This is useful for applications that only need a small image. * If the EXTRA_OUTPUT is present, then the full-sized image will be written to the Uri * value of EXTRA_OUTPUT. - * As of {@link android.os.Build.VERSION_CODES#L}, this uri can also be supplied through + * As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this uri can also be supplied through * {@link android.content.Intent#setClipData(ClipData)}. If using this approach, you still must * supply the uri through the EXTRA_OUTPUT field for compatibility with old applications. * If you don't set a ClipData, it will be copied there for you when calling @@ -281,7 +281,7 @@ public final class MediaStore { * object in the extra field. This is useful for applications that only need a small image. * If the EXTRA_OUTPUT is present, then the full-sized image will be written to the Uri * value of EXTRA_OUTPUT. - * As of {@link android.os.Build.VERSION_CODES#L}, this uri can also be supplied through + * As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this uri can also be supplied through * {@link android.content.Intent#setClipData(ClipData)}. If using this approach, you still must * supply the uri through the EXTRA_OUTPUT field for compatibility with old applications. * If you don't set a ClipData, it will be copied there for you when calling @@ -304,7 +304,7 @@ public final class MediaStore { * where the video is written. If EXTRA_OUTPUT is not present the video will be * written to the standard location for videos, and the Uri of that location will be * returned in the data field of the Uri. - * As of {@link android.os.Build.VERSION_CODES#L}, this uri can also be supplied through + * As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this uri can also be supplied through * {@link android.content.Intent#setClipData(ClipData)}. If using this approach, you still must * supply the uri through the EXTRA_OUTPUT field for compatibility with old applications. * If you don't set a ClipData, it will be copied there for you when calling |