tree f3e3ae18e5c4367748c5d2cbf2a7ebd05f346226
parent 1143033d9d67f0e2c796749b073c7e0e356864ac
author Wink Saville <wink@google.com> 1402525020 -0700
committer Wink Saville <wink@google.com> 1402525493 -0700

Merge kwd to master

Add support for type and subid to Call.java

Add MSIM and IMS to PhoneInterfaceManager

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04