tree e5426f1de11bb9bc8fd377b8cf1db47e93876646
parent 1c33529a18afe581ed05c7687b6aa3d57c7cad80
author Tom O'Neill <tomo@google.com> 1482429587 +0000
committer The Android Automerger <android-build@android.com> 1485200429 -0800

Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f
am: 2da05d0f9e

Change-Id: I8c94a06f5fa722312436484609bafcb0585d6d18
(cherry picked from commit 3b7d90c024126b9728c0f73e01e4867a188ec64b)