Tyler Gunn a21b2e30b2 resolved conflicts for merge of d0694da4 to mnc-dr-dev ...

Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a

2015-07-31 09:02:32 -07:00

..

android/telecom

resolved conflicts for merge of d0694da4 to mnc-dr-dev

2015-07-31 09:02:32 -07:00

com/android/internal/telecom

Default permissions for sim call manager

2015-07-28 22:16:25 -07:00