diff options
| author | Brad Ebinger <breadley@google.com> | 2021-05-10 22:20:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-10 22:20:44 +0000 |
| commit | 16ccba2deed8fe12e2f46a8b134f4904a79d1418 (patch) | |
| tree | a16e39d7236ed79223c1d17b5798d8e8aaec8055 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 26f28d4a29ddf43e96104e4f4ec84fcbefb24764 (diff) | |
| parent | 5272296d19c2de80bf8c458da1cd22a36ee2c153 (diff) | |
[automerger skipped] Merge "Add the REGISTRATION_TECH_NR Tech type" am: 0ad0a88143 am: e8d7017b66 am: 5272296d19 -s ours
am skip reason: Merged-In I4b0f9882dcf36e2ff7151778cbadb8e83513df5a with SHA-1 5934699aab is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699607
Change-Id: I466ecb4434215b8d081c5a23342708a72d67b172
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions