| commit | 521f5df8452fda9aa558a4740f9335441b7639ec | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:40:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:40:57 2017 +0000 |
| tree | 401abf392b2073bf982e85c616cfb4f787254a45 | |
| parent | 13f423f0e13dba88ca7823e2e9d8e3f777bce116 [diff] | |
| parent | 674c03c38fc56e5ac8790f73143af6b7a7cf0d83 [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 am: 674c03c38f -s ours Change-Id: Ia7e92b85c45eeeed918c92ebfeef0333e0e37738