Jay Shrauner 9e18d7ab70 Merge "Remove unused onConferenceWith method" into lmp-mr1-dev

2014-10-15 19:59:19 +00:00

..

android/telecom

Merge "Remove unused onConferenceWith method" into lmp-mr1-dev

2014-10-15 19:59:19 +00:00

com/android/internal/telecom

Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev

2014-10-15 18:47:03 +00:00