diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-12-21 23:43:33 +0000 |
|---|---|---|
| committer | Josh Tsuji <tsuji@google.com> | 2021-12-22 18:15:35 +0000 |
| commit | a5e9066c2740d1ea06188ca69938e220252e7d7f (patch) | |
| tree | d9f9b3aa06cf9475477fb660e401adce57a8da40 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 43ed3cf4383b773cba88051a5b2f2ddcde886cdd (diff) | |
| parent | d47e6d84d145d40a069b8cd1425a0fdcf8bc9ad6 (diff) | |
Merge "Don't allow background apps to change theme" into sc-dev am: d47e6d84d1
Fixing imports conflict
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241430
Test: build
Fixes: 211693294
Merged-In: I2086b29ef9bf3bb6fb7d9ebba6e7b8db9392e459
Change-Id: I3039403e7400a141f58f4589ef0fdae3f97b9a40
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions