commit c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e
author Fabrice Di Meglio <fdimeglio@google.com> Sat Apr 20 00:42:19 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 20 00:42:19 2013 +0000
tree 3a7b2eb24b652f8b6b32a39c16eb3c9a120df4db
parent b5ec8c145d467abbc6eaf3306a5f6725e348ceec
parent 8c08fc9a86b28c54968bde2dcbb46d744f1b6201

Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev

media/java/android/media/MediaDrm.java

diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index db43ea2..a58fa51 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -487,7 +487,7 @@
      * <p>
      * Standard fields names are:
      * {@link #PROPERTY_VENDOR}, {@link #PROPERTY_VERSION},
-     * {@link #PROPERTY_DESCRIPTION}, {@link #PROPERTY_ALGORITHM}
+     * {@link #PROPERTY_DESCRIPTION}, {@link #PROPERTY_ALGORITHMS}
      */
     public native String getPropertyString(String propertyName);