diff options
| author | Brad Ebinger <breadley@google.com> | 2020-12-04 01:38:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 01:38:46 +0000 |
| commit | 0cd2dbd97b67f33a7020c68242fb95df7495fe6a (patch) | |
| tree | 587b32d847e65baed51bd3d65a63a0aa7b6e3d56 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1a7a7718f2f26a4ba657b9abdb5aa5ac9b3fe899 (diff) | |
| parent | 9389dc60bbe2167a0eaadcab14c677c130ce98a6 (diff) | |
[automerger skipped] Merge "Add new carrier config option for enabling SIP PUBLISH of RCS caps" into rvc-qpr-dev am: c905bf06a0 -s ours am: 9389dc60bb -s ours
am skip reason: Change-Id If9ab9836261afc2d6cebb959690d8b44b06a3dfe with SHA-1 4612ab7b8c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144559
Change-Id: I352c4463866f566a20077586cce5aca3a5b8bc95
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions