diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-24 01:42:08 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 01:42:08 -0800 |
commit | 7866f2fcfa753154a492bfb3fb21061f6fcce709 (patch) | |
tree | 1765809c1beb91b3dc854ae94bfb2a5e2914ccbf /core | |
parent | 6735020adbcc7028185ca536e2b2cb49ec7687fb (diff) | |
parent | 8005b9af11ea366672d739769510240f931f3050 (diff) | |
download | frameworks_base-7866f2fcfa753154a492bfb3fb21061f6fcce709.zip frameworks_base-7866f2fcfa753154a492bfb3fb21061f6fcce709.tar.gz frameworks_base-7866f2fcfa753154a492bfb3fb21061f6fcce709.tar.bz2 |
am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '8005b9af11ea366672d739769510240f931f3050':
Remove unused field from AssetManager.
Diffstat (limited to 'core')
-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; |