Tyler Gunn d07c30d68f Merge "Add new carrier config option for video conference support." into nyc-mr1-dev ...

am: 8b38b22066

* commit '8b38b22066778b1e23583a915451c952f2221632':
  Add new carrier config option for video conference support.

Change-Id: Ia8281425aa17033489b0aa2c55669f578bfd73a7

2016-05-11 01:23:26 +00:00

..

android/telephony

Merge "Add new carrier config option for video conference support." into nyc-mr1-dev

2016-05-11 01:23:26 +00:00

com/android

Add getAidForApptype().

2016-05-05 16:12:58 -07:00