diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-01-27 08:05:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 08:05:05 +0000 |
| commit | 686fa2e950da96485ec5cb3eda6bc1a381500fb6 (patch) | |
| tree | 53fb5d1367bdfc4159c7de646a0156755c1599b6 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0df3d8876ca867005d9b9800d2d92706abd6d5ad (diff) | |
| parent | 14dfb0cfe768ececc66e7ed6b1fc7648c2da1834 (diff) | |
Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 18896c83ed am: 14dfb0cfe7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I67420def56b12c3008daaa001b8f09680439d940
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions