diff options
author | Tobias Thierer <tobiast@google.com> | 2021-03-17 12:53:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 12:53:11 +0000 |
commit | 29bc5dfbe9525fcbd51c11843b400e7af527053d (patch) | |
tree | 3be31f0018f93a23d8d2eb42aa80fac1123a39f6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | afcec9cbfeb34b249b2f2906d39cf5236685f0a3 (diff) | |
parent | 3a9dd32f616f5395aa1d231a7f34e82d19deb425 (diff) |
[automerger skipped] Merge changes from topic "bug158482162_rvc-qpr-dev" into rvc-qpr-dev am: 3a9dd32f61 -s ours
am skip reason: skip tag Change-Id I11d863229c4d62a058aaf37446a694b9c73ae5b8 with SHA-1 dabbcf5903 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13201539
Change-Id: I1bb12e64410973ff2d8668f49172298f302d216a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions