tree c791e84620f5e463518eff90258ce0d4c01aced1
parent 37e1a3928bf28a48baa05e34250b1e5665f68277
parent d3579f0c711f4cc1729becc63a9004f553ab47e8
author Tyler Gunn <tgunn@google.com> 1528234710 -0700
committer android-build-merger <android-build-merger@google.com> 1528234710 -0700

Merge "DO NOT MERGE Revise security requirements for TelephonyManager#endCall." into oc-dev
am: d3579f0c71

Change-Id: Ie32fd970f6e1b011fca9e1b095d9ed0173864ecb