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

* commit '24c16b7e4cdbacedd33347a01ff4944abfc86218':
  Frameworks/base: Fix AssetManager JNI
This commit is contained in:
Adam Lesinski
2014-11-11 19:53:44 +00:00
committed by Android Git Automerger

View File

@@ -2088,7 +2088,7 @@ static JNINativeMethod gAssetManagerMethods[] = {
{ "getAssetAllocations", "()Ljava/lang/String;",
(void*) android_content_AssetManager_getAssetAllocations },
{ "getGlobalAssetManagerCount", "()I",
(void*) android_content_AssetManager_getGlobalAssetCount },
(void*) android_content_AssetManager_getGlobalAssetManagerCount },
};
int register_android_content_AssetManager(JNIEnv* env)