diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-09-23 02:21:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-23 02:21:17 -0700 |
| commit | 29f5230dc604537a72842a70991bae71019f8c80 (patch) | |
| tree | 9a34e17bfe6e5c6f0f3e5e65c6f2ef02d8700023 /core/java/android | |
| parent | c4b16f1acb3b81c7bdee36b48de01cd5d7a96d5b (diff) | |
| parent | edc1a2bbc545a50f98ee8c9409c1861fe3522b11 (diff) | |
| download | frameworks_base-29f5230dc604537a72842a70991bae71019f8c80.zip frameworks_base-29f5230dc604537a72842a70991bae71019f8c80.tar.gz frameworks_base-29f5230dc604537a72842a70991bae71019f8c80.tar.bz2 | |
Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 3c90f1c..0e7ab52 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -255,7 +255,6 @@ public final class MediaStore { * * @see #ACTION_IMAGE_CAPTURE * @see #EXTRA_OUTPUT - * @hide */ public static final String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE"; |