tree fe129c3a1a8add8932a29523dfb6ab340a8dfbb5
parent 2d75d4447ca47666b20fe91e595a3274c8a975cf
parent bc60af7bfd4e7190086d59eea53b3dcf3cf40a6d
author Zach Jang <zachjang@google.com> 1464053230 +0000
committer android-build-merger <android-build-merger@google.com> 1464053230 +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

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

Change-Id: I4ce025692a6e6c0c96d5657d99131c306a742da4