am ae0bee53: am 81b84311: Merge "Fix clang build."

* commit 'ae0bee53b84d4ffda84270852ace1841e13f5db8':
  Fix clang build.
This commit is contained in:
Elliott Hughes
2015-02-06 05:50:01 +00:00
committed by Android Git Automerger

View File

@@ -1522,7 +1522,7 @@ static jlong
nScriptInvokeIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot)
{
if (kLogApi) {
ALOGD("nScriptInvokeIDCreate, con(%p) script(%p), slot(%i), sig(%i)", (RsContext)con,
ALOGD("nScriptInvokeIDCreate, con(%p) script(%p), slot(%i)", (RsContext)con,
(void *)sid, slot);
}
return (jlong)(uintptr_t)rsScriptInvokeIDCreate((RsContext)con, (RsScript)sid, slot);