diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 01:32:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 01:32:35 +0000 |
commit | 70ab600b571dbbfa7ffcb4ad01e3246afff13f00 (patch) | |
tree | 7ea862c83cbb3904aa867973f324e15e82a69f0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 763d7172c0efffac947a292cd113743a5f60ad60 (diff) | |
parent | a7beee21fbdd0e9ab58c01de80381cf8198b3907 (diff) |
[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into pi-dev am: 44dc2b273b -s ours am: 34709e93e6 -s ours am: 36fbfc6d1a -s ours am: 01a542b340 -s ours am: 5d9e072094 -s ours am: 93ad5f4560 -s ours am: a7beee21fb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: Ibdd7dbb0ad95bc7cea83799adb8078a6db08a2f2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions