diff options
| author | Yan Yan <evitayan@google.com> | 2021-04-21 19:29:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 19:29:43 +0000 |
| commit | f3af46a6ecc88a8c1580f2c244094e19affa2058 (patch) | |
| tree | de6d50e343cd8495a682dc671193d36ba5b6405f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c29e57fbb02ce9534a3ea1ff6ced3f8e26cd9a79 (diff) | |
| parent | 04992800bd46b46d0ad882f3752ac6e10066fcd2 (diff) | |
Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b59 am: 33f08103fa am: 04992800bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682405
Change-Id: Id235ce1f89dc48a3cf3ad26ea0217573cc1aa708
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions