Commit 95700457 authored Dec 30, 2014 by Michael Wright Committed by Android Git Automerger Dec 30, 2014

am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev

* commit 'a33424a5':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.

core/java/android/content/Context.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2142,6 +2142,7 @@ public abstract class Context {
		MEDIA_SESSION_SERVICE,
		BATTERY_SERVICE,
		JOB_SCHEDULER_SERVICE,
		MEDIA_PROJECTION_SERVICE,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface ServiceName {}