commit | 8b0ad111c3d2245a9d72ce2cb6a17c75682934ca | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:35:27 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:35:27 2017 +0000 |
tree | 7b65985c977368d3e54c7960ae8e609575d79c73 | |
parent | 0987d99c9099cd53d2bc890744fe08fe582ad2d6 [diff] | |
parent | 974d64ee8f006998649795c93c9b017d2ca83a85 [diff] |
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 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f Change-Id: If0b073a2967ab39d8ab15720e0945191c81e1078