diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-24 09:48:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 09:48:36 +0000 |
| commit | 5d094b947b328d2631a0203c1527b0c7c20ce219 (patch) | |
| tree | a5d842078e698fcf630c1757e3a0cc7c6137eca3 /core/java | |
| parent | 2474ebe879e3ebeee17bb546f4349915b1f62e4f (diff) | |
| parent | aa43eb518ce3c50c1b9a64fc526c8d1360d3789e (diff) | |
| download | frameworks_base-5d094b947b328d2631a0203c1527b0c7c20ce219.zip frameworks_base-5d094b947b328d2631a0203c1527b0c7c20ce219.tar.gz frameworks_base-5d094b947b328d2631a0203c1527b0c7c20ce219.tar.bz2 | |
am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit 'aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
Remove unused field from AssetManager.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 1 |
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; |