diff options
author | Bill Yi <byi@google.com> | 2021-04-14 01:30:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-14 01:30:08 +0000 |
commit | a7474107762f594dee6bd31502acd67a1a870fbe (patch) | |
tree | a5d50793da0f4b46daf72e857c1323018d37d08d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 95a8c189bf7663788bcc7b3cdd220cc116724f0f (diff) | |
parent | 4f15a7cf47b777f83844d701f9fbb4573b8679fe (diff) |
[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: d4df20e57f -s ours am: 4f15a7cf47 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14176451
Change-Id: Ib1d72d31954f31f9f1cefa3bd557c5bce3fb6f9e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions