diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-19 05:46:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-19 05:46:41 +0000 |
| commit | 26b65abedee60fab49b184226674236f8e89ca20 (patch) | |
| tree | 5ed3fee8540914fa3b70ad45a9721ad8fd791473 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 06d1d1086823fecf19b565f1d5194ec8c475ac66 (diff) | |
| parent | dc2c91f4f8b3d559c987c85b45578d93aafe8e43 (diff) | |
Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c33 am: a8a4a46077 am: dc2c91f4f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e3e891f2104c3363b7e6eb46c12486a76f93d50
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions