am 50e01501: Merge "Knock ::self() out of the ParseXml profile." into ics-mr1

* commit '50e015017f091118f0147d02d23140ff9f88daec':
  Knock ::self() out of the ParseXml profile.

diff --cc vm/CheckJni.cpp
Simple merge

diff --cc vm/Jni.cpp
index cbfb2ef,fac6696..f5b6005
--- 1/vm/Jni.cpp
--- 2/vm/Jni.cpp
+++ b/vm/Jni.cpp
@@@ -2365,9 -2301,9 +2301,9 @@@ static void SetObjectArrayElement(JNIEn
          return;
      }
  
 -    //LOGV("JNI: set element %d in array %p to %p", index, array, value);
 +    //ALOGV("JNI: set element %d in array %p to %p", index, array, value);
  
-     Object* obj = dvmDecodeIndirectRef(env, jobj);
+     Object* obj = dvmDecodeIndirectRef(ts.self(), jobj);
      dvmSetObjectArrayElement(arrayObj, index, obj);
  }
  

diff --cc vm/interp/Stack.cpp
Simple merge