diff options
| author | Alex Stetson <alexstetson@google.com> | 2021-03-01 08:14:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 08:14:11 +0000 |
| commit | 059f3e3314fc7d55d29ca9a82b4e89aa21eddf93 (patch) | |
| tree | 69703a82376a2c7bbebf23425d7ea7fe3c2a2b8a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 074cc33c40843d99f97bdd652bb97e88ea56ab8a (diff) | |
| parent | dfb10a81c4b9591b19453b7883c8d61f3e479af9 (diff) | |
[automerger skipped] Merge "Configure Bluetooth profiles displayed in settings" into rvc-qpr-dev am: f8501da319 -s ours am: dfb10a81c4 -s ours
am skip reason: Change-Id I62b8778517730076554ba996cee80862ce72539b with SHA-1 f87daf40c2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474716
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib986fb79f01bd19c3fa583c01efa6e17af5aa0d4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions