diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2021-04-23 06:57:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 06:57:14 +0000 |
commit | f520ca6ea4f14d997cbcd50ac9b8a3c00063eaa3 (patch) | |
tree | ed8e13ac707a349958d802da118984f4e9ce86e7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c9fd0e57e2f64fbfc4a03770028732017a15e274 (diff) | |
parent | de6d2772ede7f6949b11f1dc6fdb5aa91f579115 (diff) |
[automerger skipped] Merge "Use connectivity resources in service-connectivity" am: efcd27a0dc am: 10c557f3c6 am: de6d2772ed -s ours
am skip reason: skip tag Change-Id I778d94a5aac0c4e20e78b1ba3a002495c17a38a0 with SHA-1 6211f92cc6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967
Change-Id: Iacd373f6c0e9296aa90d2cd366cd81868f37cfa7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions