Tyler Gunn 6431276d5f Merge "Adding some new multi-endpoint stuff." into nyc-dev ...

am: a6f12cf

* commit 'a6f12cf3d059b31db6f9119317956ec44b09a76d':
  Adding some new multi-endpoint stuff.

Change-Id: Ia53b795e65a86b58d081fc0222b580fcdd6da9d8

2016-04-15 21:11:36 +00:00

..

android/telephony

Merge "Consolidate WiFi Calling string resources" into nyc-dev

2016-04-14 17:22:17 +00:00

com/android

Merge "Adding some new multi-endpoint stuff." into nyc-dev

2016-04-15 21:01:12 +00:00