diff options
| author | Yan Yan <evitayan@google.com> | 2021-03-02 00:56:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 00:56:57 +0000 |
| commit | d033e4ff5138f8323230d495031838d858b779da (patch) | |
| tree | 662c2ebfd2987f71105ddd569df0d0a2ed5823de /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1123c38bec60fde72e27e375a89c945c855e3bcd (diff) | |
| parent | 768da4ffc04798f5540cad7ee1d5261d345fafa9 (diff) | |
Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7 am: 768da4ffc0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a534378b7dc3a07784dc84400bc1460423e1270
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions