commit a4eba4957c9c819ea0b924cd30e71fa0a4bd8869
author Tyler Gunn <tgunn@google.com> Fri Jun 01 15:31:58 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 01 15:31:58 2018 +0000
tree a495fdbd4f0468e207c1553a62aec42e2a50b336
parent 2856a00b355fe5950ef57e9f67a5a3bd15f1ba68
parent 580140d6de173134940dd950260a5c942273671e

Merge changes from topic "am-7b9b57bd-d6e0-4db4-8b44-08b16768f93f" into oc-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 skipped: 4d9fe1d5a1
  [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.