tree 52c88dcf08ff2465ac5a4e8a1a4394153b0c2c27
parent 50f36be675b4d0e902a7d68c9bc675960cf45788
parent b14ae0e335ff164b486de83be634f0ba2c2a949e
author Tom O'Neill <tomo@google.com> 1482431708 +0000
committer android-build-merger <android-build-merger@google.com> 1482431708 +0000

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 am: 3b7d90c024 am: f035e8b411 am: 1cc8a2a617
am: b14ae0e335

Change-Id: Ia0f60d68b8eda909c39984a0052ee38141dd5a71