tree 28947e87d8963a29d299059a6e927121015adb29
parent b7da20e53341f0cfd22022ec6c28a75ddf097d38
parent 3e83b7b4a0ef7f1b978464628235efced25ce4ef
author Zach Jang <zachjang@google.com> 1464053989 +0000
committer android-build-merger <android-build-merger@google.com> 1464053989 +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 am: 4ace3d2075
am: 3e83b7b4a0  -s ours

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

Change-Id: I3a3fd979761effd304dda603fa3a9b282c196d28