tree bdb20148775c15a08ee93ef849a1dc28890487f3
parent 93cb7e95cb45e2d4d8b04f212ae5cf22b18ce302
author Anton Hansson <hansson@google.com> 1597844274 +0100
committer Anton Hansson <hansson@google.com> 1599490358 +0100

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