commit | 4319c6dda3c4232bb72422bafd98309f018f7fee | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:40:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:40:58 2017 +0000 |
tree | c397c6f0d018a564e20e71dd90aed8e360a4cd8f | |
parent | f283419a6cb58d9cbe69ce77bce9d8f1347631ab [diff] | |
parent | dc36b5a2a9abc9c3f9cac11dbaceed260663d545 [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 am: 8b0ad111c3 am: dc36b5a2a9 -s ours Change-Id: Ic275d09a93373969a74ad795a0e5b4ea593b2fbf