diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 16:06:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 16:06:34 +0000 |
| commit | b2ea6dba68d16ff9258f67ea9a874d09c17e4f4a (patch) | |
| tree | bcf68bc1f15754227436cf3ea72b5632614a8bb0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2fef3258ba9461f79d38a560e5461876d37fcc31 (diff) | |
| parent | 3cca4c4d961b003b711f1b4b49b8b51fa89bea18 (diff) | |
[automerger skipped] Merge "Added support for Calls.FEATURES_VOLTE in call log." am: 966020f8dd am: 1cf5d1f1f7 am: 3cca4c4d96 -s ours
am skip reason: Change-Id Ia554be9e7150ea99c45ec011c166c1bcd87ddc9a with SHA-1 2a2829a4af is in history
Change-Id: If9f7ca1e8153d9b7878b65e776fd287076de4e80
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions