diff options
author | Andy Hung <hunga@google.com> | 2021-04-30 21:53:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 21:53:39 +0000 |
commit | f4d9213903aa3356034ca3ea06c5c921264efd34 (patch) | |
tree | c93f393b28c7e3a75ce8640687e601ad7239e3ac /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 89b13f19beb14e1091a6a154d7975d16aae40132 (diff) | |
parent | 6e1398b55f0cfb879329187d0b42341fc92de782 (diff) |
[automerger skipped] Merge changes from topics "dra", "dts_uhd" am: 6a1812c30f am: ea8e392fef am: 6e1398b55f -s ours
am skip reason: Merged-In Id6078e65941020a73f8a43017f480574c2a78999 with SHA-1 fb082f6463 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691214
Change-Id: If0edc0dc78c9de2852845f45f1611b10b69120f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions