tree 99e76b3554c6c78fd71f49dde9a74ace90cad347
parent 9ed236f07d385f50dff1b4a7f478d0d409252f5f
parent a9c41cfdc5871ed44cf2e1e96719cbece11ec917
author Jordan Liu <jminjie@google.com> 1511907849 +0000
committer android-build-merger <android-build-merger@google.com> 1511907849 +0000

Merge "Support hiding manage IMS conference call button" am: 592aeeba3c am: 3ad7b87229
am: a9c41cfdc5  -s ours

Change-Id: I283928c94eee1dc3575ab82e91a91dbe29c8eecd