Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9f954cf2: Merge "Do not merge" into eclair

Browse Source 
Merge commit '9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp

* commit '9f954cf27e9e2bb94c836b1686c0e07500234b27':
  Do not merge
This commit is contained in:
Mike Reed
2010-01-20 13:21:26 -08:00
committed by Android Git Automerger
parent d2c21c1518 9f954cf27e
commit 70660425c0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android/graphics/Typeface.cpp
View File

@@ -46,7 +46,7 @@ static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface*
} }
static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) { static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {
face->unref(); SkSafeUnref(face);
} }
static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) { static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {