diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-24 09:45:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 09:45:13 +0000 |
| commit | aa43eb518ce3c50c1b9a64fc526c8d1360d3789e (patch) | |
| tree | 8d5e2228a2e7ab2edb9371d5affb4aad49fa9e5a /core/java/android/content | |
| parent | 0a33c4f9f54b59dac4e745e09db05990d53a1aba (diff) | |
| parent | 7866f2fcfa753154a492bfb3fb21061f6fcce709 (diff) | |
| download | frameworks_base-aa43eb518ce3c50c1b9a64fc526c8d1360d3789e.zip frameworks_base-aa43eb518ce3c50c1b9a64fc526c8d1360d3789e.tar.gz frameworks_base-aa43eb518ce3c50c1b9a64fc526c8d1360d3789e.tar.bz2 | |
am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '7866f2fcfa753154a492bfb3fb21061f6fcce709':
Remove unused field from AssetManager.
Diffstat (limited to 'core/java/android/content')
| -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; |