am 044f323e: am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI"
am 044f323e: am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI"

* commit '044f323e624084de464e780828f1d7f204e4d01d':
  Frameworks/base: Fix AssetManager JNI

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base