Merge changes from topic 'merge-dr1-063015' into mnc-dr-dev
authorEtan Cohen <etancohen@google.com>
Mon, 6 Jul 2015 22:09:51 +0000 (22:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Jul 2015 22:10:06 +0000 (22:10 +0000)
commit4c68267e68b41dd7a4af7757b412d0a5faff94da
tree74f682d29975284b9a5ba6e3910ab9feeb72a0cd
parent2acea6f98afe057fa1a3faf744b240563cdf6ee2
parenteea3d44c049ec27c98c531b5f05b1c2d267cba73
Merge changes from topic 'merge-dr1-063015' into mnc-dr-dev

* changes:
  Stub base class implementation for some IMS interfaces
  IMS: Add an extra for ims phantom MO call.
  MWI,phantom call,Suppl services
src/java/com/android/ims/ImsManager.java