diff options
| author | Brad Ebinger <breadley@google.com> | 2020-12-02 01:55:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-02 01:55:27 +0000 |
| commit | c1fc66c9a9d8ef5559ee9db6df8224f572373378 (patch) | |
| tree | 1ecb1b942ca3308de260a8ce8bcf62adde52f1b0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3e871d1373ae5fb4a4681c41684f6b0a4705cadc (diff) | |
| parent | 5f32287f80b24019af600865378533932c773eb4 (diff) | |
[automerger skipped] Merge "Add new carrier config option for enabling SIP PUBLISH of RCS caps" am: 88f8c04dc3 am: f833ff0d2c am: 5f32287f80 -s ours
am skip reason: Change-Id If9ab9836261afc2d6cebb959690d8b44b06a3dfe with SHA-1 4612ab7b8c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515260
Change-Id: I17122ddace137ba1520f08be47927e8ec128e4d2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions