Merge "Fix documentation issue" into mnc-dev

2015-08-17 21:51:47 +00:00
parent 46ae218b2a 9b70f44b2a
commit 757e2c7f3e
1 changed files with 0 additions and 3 deletions
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -240,9 +240,6 @@ public final class MediaStore {
     * An application implementing a prewarm service should do the absolute minimum amount of work
     * to initialize the camera in order to reduce startup time in likely case that shortly after a
     * camera launch intent would be sent.
-     * <p>
-     * If the camera launch intent gets fired shortly after, the service will be unbound
-     * asynchronously, without receiving
     */
    public static final String META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE =
            "android.media.still_image_camera_preview_service";