summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-24 09:27:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-24 09:27:48 +0000
commit3c30eff63fb33901df4e040ecce78f7755be588f (patch)
treee51777853aac21fd6dada6bd81566d46a2c9948d /core/java/android
parenta3106d1dbe5141a6df742262f4bbe8cf2c8ea915 (diff)
parent2f756cbb5aeb1f4dcbcb28baa0fbd0a478e7371b (diff)
downloadframeworks_base-3c30eff63fb33901df4e040ecce78f7755be588f.zip
frameworks_base-3c30eff63fb33901df4e040ecce78f7755be588f.tar.gz
frameworks_base-3c30eff63fb33901df4e040ecce78f7755be588f.tar.bz2
Merge "Remove unused field from AssetManager."
Diffstat (limited to 'core/java/android')
-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 48211b5..93ce633 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -70,7 +70,6 @@ public final class AssetManager {
// For communication with native code.
private int mObject;
- private int mNObject; // used by the NDK
private StringBlock mStringBlocks[] = null;