| commit | 0fe8ea20962249c257762c81896758a9f7ecf659 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Sat Oct 03 00:52:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 03 00:52:32 2015 +0000 |
| tree | 75b976890c65c9f2124afcee4489b44974c9a203 | |
| parent | 4b6c23348ee54a0d7f5bbe16a4fc18d771f4764d [diff] | |
| parent | 697e3dd6b9a8be4451e19ab7c03ced310602b92a [diff] |
am 697e3dd6: am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master * commit '697e3dd6b9a8be4451e19ab7c03ced310602b92a': Don't unregister Fonts from renderer at destruction