Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70660425 authored by Mike Reed's avatar Mike Reed Committed by Android Git Automerger
Browse files

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

Merge commit '9f954cf2' into eclair-plus-aosp

* commit '9f954cf2':
  Do not merge
parents d2c21c15 9f954cf2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface*
}
 
static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {
    face->unref();
    SkSafeUnref(face);
}

static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {