tree f67d13e5564615347fec8baec709cc1745dc1151
parent 0a97d3f909a29468f4de75242ba42200deb93b64
parent 11af5514dfad96a30be2972e65306268040e1e52
author Adam Seaton <aseaton@google.com> 1495221297 +0000
committer android-build-merger <android-build-merger@google.com> 1495221297 +0000

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
am: 11af5514df  -s ours

Change-Id: If06ae105d14f94816787580e5146bfd38fc85126