Merge "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: 97794d9cbd" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
a1fc2bf6cd