tree 262e98d010b1f572ab6c443a3d08c90b60909cca
parent 28d0c6120c8c89e054744058754612e68f51d822
parent 1335994507a9dd0780e0c770d1ba6dbe059176c7
author Tyler Gunn <tgunn@google.com> 1464805286 +0000
committer android-build-merger <android-build-merger@google.com> 1464805286 +0000

Merge "Ensure external calls do not go through call blocking code." into nyc-mr1-dev
am: 1335994507

* commit '1335994507a9dd0780e0c770d1ba6dbe059176c7':
  Ensure external calls do not go through call blocking code.

Change-Id: Ia08ad649b8ca6ca46cbe65c4c4f1d43261439e40