am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev

* commit '581fd0fb2ecbd6d9ee049bb08f395ec04709eb74':
  Fix documentation issue
This commit is contained in:
Jorim Jaggi
2015-08-17 22:05:30 +00:00
committed by Android Git Automerger

View File

@@ -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";