diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 02:52:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 02:52:10 +0000 |
commit | bb6676222dd23e2a0758ac77d019fe793a41e801 (patch) | |
tree | 3e7b2605b333de53c87ced4586e0b543d17ca504 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ce48ff15be752796f3ee8ec9a27c4ecb5536e057 (diff) | |
parent | 7fb056725e495f937f438cc4c678c172acb650a3 (diff) |
[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511e0 -s ours am: 5a1724e2ce -s ours am: 037fa26965 -s ours am: abc15657c4 -s ours am: 8ab6bd5bce -s ours am: 7fb056725e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616710
Change-Id: I1bbc8b421967850be2eabb4677ef0f00e936fa13
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions