diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-08 05:19:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 05:19:14 +0000 |
| commit | 7a40de6568e1870e352a5d512f6912fbd3b507fe (patch) | |
| tree | bff20ddd6b5e1700b6d0c58e99e8ef95b8a12d67 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4c4b48fcd247f1c6ee3146f618cbe16dd8d20f8e (diff) | |
| parent | a83d65e7aae566c2d170ecbe802c6444d05e83a9 (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: a83d65e7aa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17102592
Change-Id: I2f9e51697afe451a533682aeb391eeb7a4d806c0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions