diff options
| author | Brad Ebinger <breadley@google.com> | 2020-11-13 18:03:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-13 18:03:35 +0000 |
| commit | 1823854663227f7c34fd3bc68196ff93ad9e4467 (patch) | |
| tree | 4367b9bd7b162e0fc49a1b528e625fde7f22572f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8b3df4552a86b17ee1c9d4bf474081ef00bcd932 (diff) | |
| parent | 7860541df4ee7e095c4642d05d9537be2d91704f (diff) | |
Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def" am: c87a43111a am: ccc2835223 am: 8ffeb462fb am: 7860541df4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477122
Change-Id: I21093871affa12c76c5091e7263cafb56fe1c682
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions