summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2014-01-24 09:52:55 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-01-24 09:52:55 +0000
commit01664b3709451d287f30a68fcb8f599e8dc484a5 (patch)
tree76ba05d47c462dbb81b4999caba0641d298a7c16
parentd3dac575aa7ed727cf37618f089a0017a603bff0 (diff)
parent5d094b947b328d2631a0203c1527b0c7c20ce219 (diff)
am 5d094b94: am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '5d094b947b328d2631a0203c1527b0c7c20ce219': Remove unused field from AssetManager.
-rw-r--r--core/java/android/content/res/AssetManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index 168928cda4dd..8944dcb9a6fb 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -69,7 +69,6 @@ public final class AssetManager {
// For communication with native code.
private int mObject;
- private int mNObject; // used by the NDK
private StringBlock mStringBlocks[] = null;