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-03-05 08:40:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-05 08:40:53 +0000
commit20a72487ad610fa1568cf50e2a3859a18e52f056 (patch)
treec09a63e9192b8dbad1977bcd89eff51d0388459f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6f82a75b5ae1d6172cc0ba07d24b41014a06d202 (diff)
parent13805decc7ae08011019764acc3830366aa23d49 (diff)
[automerger skipped] Merge "Disable auto time zone on non-telephony devices" into rvc-dev am: 13805decc7 -s ours
am skip reason: Change-Id Iea9c9e04c5617ccf0ba20511344884d3d88f2a9b with SHA-1 2c6c3c3daf is in history Change-Id: I1863805274e72ffc36e63eab6d48b9f2dc702e70
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions