summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 21:55:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 21:55:00 +0000
commit1aace60d5f160484d30b13f7960d0bd88e803c52 (patch)
treeadd592aeabf91a20f8622ce67733195c31f86712 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent00712e260c9dfe7fbed160d86f9e1fae3ed1f2f5 (diff)
parentf0b9f042de157073e4765c49f36d8ba04072604c (diff)
[automerger skipped] Merge "Add HomeVisibilityObserver APIs in ActivityManager." am: cb47d86158 am: c1363ad2b9 am: f0b9f042de -s ours
am skip reason: Change-Id I2f250cdd53a667b2d89e84e589b0ae0bc94a8aa3 with SHA-1 c99b83b95f is in history Change-Id: I2a423f4e9d1d8f5e008a96c8fc7719855be4ed76
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions