diff options
| author | Shuo Qian <shuoq@google.com> | 2021-01-08 10:42:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-08 10:42:27 +0000 |
| commit | 85dee397ae73286a95b3b1908b877f677e9bdf00 (patch) | |
| tree | f98a4731298158386bcd7a171ef18989d171a297 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 66e322ee70d1f80f67634a1a8bc2257fe5bc60fd (diff) | |
| parent | d26b0ed704d0224edb182a085408b7a4b79787e6 (diff) | |
[automerger skipped] Merge "Add Call Composer Tuple in RcsContactPresenceTuple class" am: 45a397a84a am: f9bdfcccc4 am: d26b0ed704 -s ours
am skip reason: Change-Id Id1c3eaf11d85ec5df3c253443bafdb18fd31ccce with SHA-1 111e80214e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542210
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0eab13913abbcbf272db3c9f73986988bd7e70b6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions