tree 9dd0348e9bd0df3d48212e0c2b869011c433e0ed
parent f8691aee4800045f5ceaad7d5ad54ab72bd7e897
parent 77ce4e9cb542ba5aa8c64edd69c57e86d0c7e661
author Tyler Gunn <tgunn@google.com> 1528238398 -0700
committer android-build-merger <android-build-merger@google.com> 1528238398 -0700

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

Change-Id: Iec9bbf93fbfef5b4a3466485ba232a9ec38ec0bd