diff options
author | Xin Li <delphij@google.com> | 2021-05-08 22:45:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-08 22:45:12 +0000 |
commit | b5eb7582ad9aaaadbf15ba67be188da261c1601f (patch) | |
tree | 7264dbb83807c26a6aa5ebdbf61e0b8a99ce03f8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 46f671f7a3f18c61367de8c6006400a5e53e8678 (diff) | |
parent | 8fdc05d89c8f9598be2b4de0bc73e06f4e666374 (diff) |
[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 4ba43d5b0b am: 8fdc05d89c -s ours
am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 ed2ff0f5da is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700314
Change-Id: I76681ea55fcc2d9806f0ad87162a4b96abf419a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions