tree a495fdbd4f0468e207c1553a62aec42e2a50b336
parent 1900f810b95d2f2901cacf04b886081d4347e44c
parent dd12cfe45e9d52525a80a04b9c234feece5430e6
author Tyler Gunn <tgunn@google.com> 1528216804 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528216804 +0000

Merge changes from topic "am-538bf8fd-0fa8-4c10-aeea-2cd19adfb09f" into oc-dev

* changes:
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb am: e89a641900 am: ee4c0fedba skipped: 03900d8e80
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb am: e89a641900 am: ee4c0fedba
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb am: e89a641900
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56
  DO NOT MERGE Revise security requirements for TelephonyManager#endCall.