Aside from nits, LGTM. http://codereview.appspot.com/6259063/diff/1/src/ports/SkFontHost_android.cpp File src/ports/SkFontHost_android.cpp (right): http://codereview.appspot.com/6259063/diff/1/src/ports/SkFontHost_android.cpp... src/ports/SkFontHost_android.cpp:145: if(NULL == family) { Skia usually has a space after the 'if'. http://codereview.appspot.com/6259063/diff/1/src/ports/SkFontHost_android.cpp... src/ports/SkFontHost_android.cpp:724: SkAutoMutexAcquire ac(gFamilyHeadAndNameListMutex); Extra space?