summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2020-05-07 06:37:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-07 06:37:23 +0000
commit9e6d1b174fec80f1e0803c022358f34a79193d0d (patch)
treebfe4baa3f58a32e3cd5a41ccc944fb74918f3e90 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent385cbb2610594f772b930dd7a5335f3eb7c50e92 (diff)
parent73bdbd8362d34a97cfc8b1cff674e3250b5994db (diff)
[automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 09a2ff81c7 -s ours am: 1a8f7eafc9 -s ours am: 73bdbd8362 -s ours
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 30be5e5d3d is in history Change-Id: I4d8faea3916fe55ca25d4162893f22d004176116
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions