Prevent IMS call merge if the peer call has a pending update request. am: c7ff7ee0b5
am: 1fc4b3381c  -s ours

Change-Id: I452a8d8b91363d6223128eb517380a8a489962e2
tree: 96f342849124b4835d7c807af5d4c484420c0e2f
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. OWNERS
  6. README.txt