diff options
| author | Tyler Gunn <tgunn@google.com> | 2020-10-26 17:54:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-26 17:54:31 +0000 |
| commit | 7989e6e369cef6207528f45248a420b7f3dbb73e (patch) | |
| tree | ed76cc21f04eb4d8b96bcb14d215c900bf24910e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 688d81ebc992d50cf88d20adbccd2203b8671b57 (diff) | |
| parent | 25be0a92614ad45f2fa573382a28e126912ee1a4 (diff) | |
[automerger skipped] Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" am: 5c17953fb7 am: 8f430654a3 am: cf81701713 -s ours am: 25be0a9261 -s ours
am skip reason: Change-Id I3d71331cbc8f01f764cc0b9704416821007feeb5 with SHA-1 4cead2c3e8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470697
Change-Id: I54a5eb1f20102f26be002ea5d95d6ee4d8b01d93
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions