diff options
| author | Yimin Li <ymli@google.com> | 2022-01-19 18:52:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-19 23:33:24 +0000 |
| commit | 2b1e74f35f9901253124876c6a5a9e65a69a3a39 (patch) | |
| tree | 3dbad8c4cfbc390521814868a3f8b7d9336622b1 /tools/aidl/generate_java.cpp | |
| parent | bbce7ec2a18ac47fa28ef521feb74009d4d2af43 (diff) | |
resolve Coastguard cherrypick merge conflict for change: 16668378
Change-Id: Ic09129ddc2075e859d7e0fba94ef1436e05b5089
(cherry picked from commit 2210c39f51b946ec905a5e38f8017ac66b52698b)
Merged-In:Ic09129ddc2075e859d7e0fba94ef1436e05b5089
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions