tree 49a64a3c816236e274f156dfe70dfecef596f491
parent 1c2af67b5192657c786a716ffb4a0604a67afe75
parent 042abfe688d7e30d4de8aa1122e6c71ef50c8394
author Tyler Gunn <tgunn@google.com> 1550247522 -0800
committer android-build-merger <android-build-merger@google.com> 1550247522 -0800

Merge "Fix multisim issue with sim call manager." am: fce9a3a4b3
am: 042abfe688

Change-Id: Ibb50f4ad86d658d9cb8857164bfb3d33dfc4e482