diff options
| author | Evan Rosky <erosky@google.com> | 2021-09-14 10:34:34 -0700 |
|---|---|---|
| committer | Evan Rosky <erosky@google.com> | 2021-09-14 10:49:20 -0700 |
| commit | 3f3f21406d3c2a9788754b7580cac3b812b46cf3 (patch) | |
| tree | fac48d61006e876fb370841a8b1b3761ec5737be /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e7b68347335fbe9a0f4ee6c8626d3dad324411ea (diff) | |
Fix a bad merge
A previous merge went in that incorrectly removed this part of another
change (I993dad973ea4b273f77df5671a93cbfd9b21e808). This CL is undoing
that.
Bug: 183993924
Test: atest ActivityLifecycleTests with shell transitions enabled
Change-Id: I75b69b539d99305a764dc3e7bc61278eaa5817e2
Merged-In: I1138079b1ae05248cefa211e0597fd6723a8bbba
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions