diff options
author | Stephen Hines <srhines@google.com> | 2015-10-03 00:52:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-03 00:52:32 +0000 |
commit | 0fe8ea20962249c257762c81896758a9f7ecf659 (patch) | |
tree | 75b976890c65c9f2124afcee4489b44974c9a203 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions