am 43e9eb28: am 9ddb7df8: Fix build.

Merge commit '43e9eb28ab9a246472149384567f505434f492a3' into eclair-mr2-plus-aosp

* commit '43e9eb28ab9a246472149384567f505434f492a3':
  Fix build.

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java
index 06dd96f..6c1b5b3 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java
@@ -32,21 +32,21 @@ public class BridgeAssetManager extends AssetManager {
      * {@link Bridge} calls this method after setting up a new bridge.
      */
     /*package*/ static AssetManager initSystem() {
-        if (!(AssetManager.mSystem instanceof BridgeAssetManager)) {
+        if (!(AssetManager.sSystem instanceof BridgeAssetManager)) {
             // Note that AssetManager() creates a system AssetManager and we override it
             // with our BridgeAssetManager.
-            AssetManager.mSystem = new BridgeAssetManager();
-            AssetManager.mSystem.makeStringBlocks(false);
+            AssetManager.sSystem = new BridgeAssetManager();
+            AssetManager.sSystem.makeStringBlocks(false);
         }
-        return AssetManager.mSystem;
+        return AssetManager.sSystem;
     }
     
     /**
-     * Clears the static {@link AssetManager#mSystem} to make sure we don't leave objects
+     * Clears the static {@link AssetManager#sSystem} to make sure we don't leave objects
      * around that would prevent us from unloading the library.
      */
     /*package*/ static void clearSystem() {
-        AssetManager.mSystem = null;
+        AssetManager.sSystem = null;
     }
     
     private BridgeAssetManager() {