Merge "Frameworks: Let GuardedBy accept multiple locks" am: 940a9e95df

am: b32933c3cc

Change-Id: I41d775008409d4b0d4cedf15084721131eea86fd

core/java/com/android/internal/annotations/GuardedBy.java

@@ -23,10 +23,10 @@ import java.lang.annotation.Target;
 
 /**
  * Annotation type used to mark a method or field that can only be accessed when
- * holding the referenced lock.
+ * holding the referenced locks.
  */
 @Target({ ElementType.FIELD, ElementType.METHOD })
 @Retention(RetentionPolicy.CLASS)
 public @interface GuardedBy {
-    String value();
+    String[] value();
 }