commit | 674c03c38fc56e5ac8790f73143af6b7a7cf0d83 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:38:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:38:58 2017 +0000 |
tree | 401abf392b2073bf982e85c616cfb4f787254a45 | |
parent | e19a6c202fa248bf60fd9fff2e7ea800fb748e07 [diff] | |
parent | 5311ff5db5462b565e2f056f87e88313fe13078a [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 -s ours am: 588a0f8523 -s ours am: 5311ff5db5 -s ours Change-Id: I743e41d1c663079b9b2d241515576c5267b75832