summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-08-10 23:52:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-10 23:52:49 +0000
commitc5289c3ab390387a5678d55f3cfe71730ea52f23 (patch)
tree4aa80ae6b59725b09cc82864a71b7328f89cbda7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent93322f93e0172cf29d2d5c2b0a745b3cddda6c88 (diff)
parent8b47e63e92daeec63f723bfac0a6bbc4fc4dc023 (diff)
[automerger skipped] Merge "Resume next activity if pausing app died" into rvc-qpr-dev am: 813999adbd am: 8b47e63e92 -s ours
am skip reason: Change-Id I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b with SHA-1 f191f9a73b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343623 Change-Id: I6c66e7134fe37c3c7ef084b79fbe1f846c479616
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions