diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-31 17:11:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 17:11:58 +0000 |
| commit | c1836bb0f1bf3e5ef0911719525da0bab3e53507 (patch) | |
| tree | 616e87b836bf7dc35558971d19743a467e4e665f /core/java/android/provider | |
| parent | d0694da4fb85bb01e7c0ea7989a78a0e635453ac (diff) | |
| parent | 0e3de6cacaffcfeda4d6353be61e2f1f9ed80705 (diff) | |
| download | frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.zip frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.gz frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.bz2 | |
Merge "Change MNC codename to just M." into mnc-dev
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index e63fb04..9babf43 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -284,7 +284,7 @@ public final class MediaStore { * If you don't set a ClipData, it will be copied there for you when calling * {@link Context#startActivity(Intent)}. * - * <p>Note: if you app targets {@link android.os.Build.VERSION_CODES#MNC MNC} and above + * <p>Note: if you app targets {@link android.os.Build.VERSION_CODES#M M} and above * and declares as using the {@link android.Manifest.permission#CAMERA} permission which * is not granted, then atempting to use this action will result in a {@link * java.lang.SecurityException}. @@ -338,7 +338,7 @@ public final class MediaStore { * If you don't set a ClipData, it will be copied there for you when calling * {@link Context#startActivity(Intent)}. * - * <p>Note: if you app targets {@link android.os.Build.VERSION_CODES#MNC MNC} and above + * <p>Note: if you app targets {@link android.os.Build.VERSION_CODES#M M} and above * and declares as using the {@link android.Manifest.permission#CAMERA} permission which * is not granted, then atempting to use this action will result in a {@link * java.lang.SecurityException}. |