tree 42bdf05d9139119e473908b32a51b9d24bd560a8
parent 6a912c14ddc39e3ef70ba2b4b484ef080ef61d3b
parent e29b42ffef47991c090ca8008a9addb9e479fc2a
author Zach Jang <zachjang@google.com> 1464210671 +0000
committer android-build-merger <android-build-merger@google.com> 1464210671 +0000

Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401
am: e29b42ffef

* commit 'e29b42ffef47991c090ca8008a9addb9e479fc2a':
  Updating security string to 2016-07-05

Change-Id: Ide9c0807d54ed1bab3dc65e0f1c04a4bb856ace2