| commit | b83a7484e55ecb12ffafaf8101c3a8d9dcd340a7 | [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 | 277bc9cd0535e51a50ce75a2d1c7cd8ac9c6341b | |
| parent | 8826dbe25c9e75d9320e3f766dd937bb0e25a8a6 [diff] | |
| parent | c3e02c8acc0e5352b102669e5c73b4334ae65d06 [diff] |
am 697e3dd6: am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master * commit '697e3dd6b9a8be4451e19ab7c03ced310602b92a': Don't unregister Fonts from renderer at destruction