diff options
| author | Anton Hansson <hansson@google.com> | 2020-09-07 14:41:30 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-09-07 14:41:30 +0100 |
| commit | 3e20672380e389ce324eee08ea6a1c6288b99868 (patch) | |
| tree | 6ff4bd228bc9e1121423e7d180f748cf94799569 /tools/aapt2/java/AnnotationProcessor_test.cpp | |
| parent | 7a9bc4eb26a0296e9b15e085cc478f0d39e1ee0a (diff) | |
Merge the framework-defaults into framework-minus-apex
As of I1cea62aaedb7e653648130e3d315761c0c9aece4, there is only
one user of framework-defaults, so the separate defaults are no longer
needed.
Test: m
Change-Id: Ia06b50195dcf7de076664af4592616be5264ae21
Merged-In: Ia06b50195dcf7de076664af4592616be5264ae21
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions