summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorGavin Corkery <gavincorkery@google.com>2020-04-17 19:05:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-17 19:05:01 +0000
commit733a3ce7fac92db2148129419bd483a1010677cd (patch)
treeaea02db2cda703aa776b1702ff3761d81944795d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3ec646d9776fc3b2b898ce445b2318de747ebc1f (diff)
parent4ce404782fa3eddae53a356df3849a676bcafb88 (diff)
[automerger skipped] Merge "Ensure userspace reboot is supported before logging" into rvc-dev am: 56a5a72e73 -s ours am: 4ce404782f -s ours
am skip reason: Change-Id Ic3041ff3abe0d2641d3d99fc8e816f1f5c491a34 with SHA-1 eb52a69444 is in history Change-Id: I425cbd54cd24b0172d1fb19a9525bb97ce545d85
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions