diff options
author | Brad Ebinger <breadley@google.com> | 2021-02-04 01:28:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 01:28:37 +0000 |
commit | 5bbee4a0bb938edbde4ba489edc575ff5cd25276 (patch) | |
tree | 331d610da468e1e6a270d6cfb86194b919b30e10 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 407c766a8b30b3c2c4111de7b61494218247e9c2 (diff) | |
parent | a30ce7ea41db832e284e941896d2d3a779d7c6bc (diff) |
Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 am: a30ce7ea41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If16559974e91b7d231485b8e73416289f629a553
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions