Dan Willemsen 1398e8e5aa resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp ...

Change-Id: Idd5fb6b64120af303a2987c7449e59face7d77be

2016-07-30 12:48:07 -07:00

..

android/telephony

resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp

2016-07-30 12:48:07 -07:00

com/android

Add support for carrier "associated" apps.

2016-07-26 14:54:53 -07:00