Robert Greenwalt 7ac7214b78 resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp ...

am: 1398e8e5aa

Change-Id: I187acf0aa781dcb88248e52361bcd097ced92312

2016-07-31 03:43:31 +00:00

..

android/telephony

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

2016-07-31 03:43:31 +00:00

com/android

Add support for carrier "associated" apps.

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