diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-08 04:54:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 04:54:51 +0000 |
| commit | a83d65e7aae566c2d170ecbe802c6444d05e83a9 (patch) | |
| tree | 5b2e7fb7103eba0798bfaa8eb2b2a5a6b4acdff8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1e8500e34cd670497501b24bb230d6c223e51574 (diff) | |
| parent | e4f01f7717bbaeb09737ddb6be263376dcbdbaad (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-qpr-dev am: d4ef6e49a1 -s ours am: e4f01f7717 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17102592
Change-Id: I45b762f9a409bb584a6748ea43276622f7c997f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions