OSDN Git Service

Merge "Add carrier config variable to hide manage IMS conference call button" am...
authorJordan Liu <jminjie@google.com>
Tue, 28 Nov 2017 22:23:42 +0000 (22:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Nov 2017 22:23:42 +0000 (22:23 +0000)
commit5cb676391896270e2258f2dac52a1b0d23f90442
treee4db82f5d366dc94ee7c0f4e3ed3ca27ce7e13e2
parent33619ed5476fc204167751012ab2f48315c87f07
parent9a1be6187f4c2b08361acd9258140aed94b1bad9
Merge "Add carrier config variable to hide manage IMS conference call button" am: dc98d6e44b am: 7a42c3614e
am: 9a1be6187f  -s ours

Change-Id: Iaa42715945ecdf29efd6acc733755979ecde152e