diff options
| author | Stephen Hines <srhines@google.com> | 2015-10-03 00:46:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-03 00:46:17 +0000 |
| commit | 697e3dd6b9a8be4451e19ab7c03ced310602b92a (patch) | |
| tree | e736cb740f4c8e4a0586e2a554b7d9e9773f31b0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3cb53543e224c0f98801d71c22a2d81974186597 (diff) | |
| parent | ee144b1e60a88e8f097113e046813f0b61c38b9b (diff) | |
am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master
* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
Don't unregister Fonts from renderer at destruction
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions