4c26068d499c66faccfc303631878deaf9f90d29 - platform/packages/services/Telephony

commit	4c26068d499c66faccfc303631878deaf9f90d29	[log] [tgz]
author	Tyler Gunn <[email protected]>	Fri Jun 01 15:31:58 2018 +0000
committer	Android (Google) Code Review <[email protected]>	Fri Jun 01 15:31:58 2018 +0000
tree	033422bfefc0e908b01fa8325df3273e4a296cf4
parent	81b6b1f36016cfe00223802ca1d8bde8e2baa8c4 [diff]
parent	4d9fe1d5a1b3da662bd7e99d7e805b45334bb5bc [diff]

Merge changes from topic "am-7b9b57bd-d6e0-4db4-8b44-08b16768f93f" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904 am: db1c06a56c am: 47871c3240 skipped: 198e2c64d1 am: 71e88a5015 am: 25bda5a7c9 am: 361879742f am: 166cdb62eb
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904 am: db1c06a56c am: 47871c3240 skipped: 198e2c64d1 am: 71e88a5015 am: 25bda5a7c9 am: 361879742f
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904 am: db1c06a56c am: 47871c3240 skipped: 198e2c64d1 am: 71e88a5015 am: 25bda5a7c9
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904 am: db1c06a56c am: 47871c3240 skipped: 198e2c64d1 am: 71e88a5015
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904 am: db1c06a56c am: 47871c3240 skipped: 198e2c64d1
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904 am: db1c06a56c am: 47871c3240
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904 am: db1c06a56c
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: c62acb0904
  DO NOT MERGE Revise security requirements for TelephonyManager#endCall.

tree: 033422bfefc0e908b01fa8325df3273e4a296cf4