diff options
author | Jordan Liu <jminjie@google.com> | 2017-11-28 22:11:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-28 22:11:38 +0000 |
commit | 9a1be6187f4c2b08361acd9258140aed94b1bad9 (patch) | |
tree | 2d66244d6ab5892c16ff508e029b06db28a1c057 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | aa3bdbe815a010205757b13fb55411e28fee2408 (diff) | |
parent | 7a42c3614ee977f798fe6c057b57eac9ee6cffae (diff) |
Merge "Add carrier config variable to hide manage IMS conference call button" am: dc98d6e44b
am: 7a42c3614e
Change-Id: I0bb715785a7ea0286936b1213c5057497b8856de
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions