Scott Lobdell d13f57db1b Merge QP1A.190107.001 ... Conflicts: src/com/android/server/telecom/CallIntentProcessor.java src/com/android/server/telecom/CallsManager.java Bug: 122976681 Change-Id: Icd878977c291b0e63f839e151fea322950e272e8		2019-01-17 09:56:06 -08:00
..
res	…
src/com/android/server/telecom/tests	Merge QP1A.190107.001	2019-01-17 09:56:06 -08:00
Android.mk	Merge QP1A.181008.001	2018-10-09 16:27:23 -07:00
AndroidManifest.xml	[Call Screening]Programmatically changing the default call screening app.	2018-11-01 09:05:28 +00:00
AndroidTest.xml	Exempt tests from hidden API checks.	2018-05-30 17:51:08 +00:00