Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev

core/java/android/app/admin/SecurityLog.java

@@ -144,8 +144,7 @@ public class SecurityLog {
         }
 
         /**
-         * Returns the payload contained in this log. Each call to this method will
+         * Returns the payload contained in this log entry or {@code null} if there is no payload.
-         * retrieve the next payload item. If no more payload exists, it returns {@code null}.
          */
         public Object getData() {
             return mEvent.getData();