tree 71272dc5a369c876a5dca07ae08134cd13e7ce06
parent fbf01117d35469f273dbe1465f1e9450917637dc
parent 2af23a3c208b4480998923edc1479919093bc6b9
author Zach Jang <zachjang@google.com> 1464053686 +0000
committer android-build-merger <android-build-merger@google.com> 1464053686 +0000

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5  -s ours am: e495d379de  -s ours am: 8b961c808b am: 3cba9b15f7 am: 8ebaeae1f6  -s ours am: 9ae8c7356e am: bc60af7bfd am: 37e618fef8 am: c3d3f6bad9  -s ours
am: 2af23a3c20

* commit '2af23a3c208b4480998923edc1479919093bc6b9':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: Ia0b764a4ff323bd52e92d0c1814e0940ed3dfd2d