tree 938f290adffafa26f067732d9aa4a1a900fd94e9
parent 535ade48f8ec8ba8cc30f153ae4bd5272bed39c7
parent 5c7bac6231131fbc09f96f5409912122bc65ef1c
author Adam Seaton <aseaton@google.com> 1495221960 +0000
committer android-build-merger <android-build-merger@google.com> 1495221960 +0000

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df  -s ours am: 4cfcc9fe73 am: 8a893de625  -s ours am: 9f169ddbcd
am: 5c7bac6231

Change-Id: Idc1d79faa12fdd938f57e1678fbb34bbbc9c6bcd