diff options
| author | Brad Ebinger <breadley@google.com> | 2020-10-21 23:25:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-21 23:25:50 +0000 |
| commit | 371361d9955798ebef8473287c21caf8052741ba (patch) | |
| tree | 8b024c705f8157cfe12b40c0ac4f048fb273e0f1 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6e0f901a049f2fc747337f6205d55074d1f48770 (diff) | |
| parent | 9caec7855727db80524ca759dcd24fe75acc64f9 (diff) | |
Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec78557
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453715
Change-Id: Iae859694e72a55c41f0bbf23bb6e5719f56bfed1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions