commit cec7eb1c079331ba38ed4472abe26a55d6427324
author Kenny Root <kroot@google.com> Sun Sep 12 19:34:30 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Sep 12 19:34:30 2010 -0700
tree 30b683042ed7860d9b4185ec5c51be248a71eac8
parent df10a19296b7c69b9bd314806d1de24ed698bc46
parent 8b11f30cb2cfe9922439e8a032311de114ce4da4

am 8b11f30c: am 1bece432: Make nativeLibraryDir visible in the API

Merge commit '8b11f30cb2cfe9922439e8a032311de114ce4da4'

* commit '8b11f30cb2cfe9922439e8a032311de114ce4da4':
  Make nativeLibraryDir visible in the API

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index 9808ec5..4c549bd 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -53807,6 +53807,16 @@
  visibility="public"
 >
 </field>
+<field name="nativeLibraryDir"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="permission"
  type="java.lang.String"
  transient="false"

core/java/android/content/pm/ApplicationInfo.java

diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index ae6a311..38d897e 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -354,8 +354,6 @@
 
     /**
      * Full path to the directory where native JNI libraries are stored.
-     * 
-     * {@hide}
      */
     public String nativeLibraryDir;