Commits
Stephen Hines authored and Android Git Automerger committed 697e3dd6b9aM
am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master * commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b': Don't unregister Fonts from renderer at destruction
Showing diff to3cb53543e22