diff options
author | Brad Ebinger <breadley@google.com> | 2020-12-04 01:35:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 01:35:14 +0000 |
commit | 9389dc60bbe2167a0eaadcab14c677c130ce98a6 (patch) | |
tree | 56cd5a90bdc0de096fa9719bbf3dacff2157e648 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a00ca3f0444580334368960469c33aa64b65e8f2 (diff) | |
parent | c905bf06a0b1601c3fc0723f3e8a8bddd6611873 (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 skip reason: Change-Id If9ab9836261afc2d6cebb959690d8b44b06a3dfe with SHA-1 21f6792a14 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144559
Change-Id: Ia9875229b1ec43b7a3857c9b92f38d254098d3bd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions