diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 01:32:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 01:32:42 +0000 |
| commit | 611b3330977d1ad78f7750ef9c1e08528c5d488c (patch) | |
| tree | 7ea862c83cbb3904aa867973f324e15e82a69f0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 70ab600b571dbbfa7ffcb4ad01e3246afff13f00 (diff) | |
| parent | 010acb9847ff1f1edbcfd1b59745eb755e59a1d3 (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: c63f658ff0 -s ours am: 864ff0fff1 -s ours am: 010acb9847 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: Iace47fd423d5da40743c7fa8c7ceb41e69efb4d6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions