tree 69db2914e800bb7f9ab11636420f0b0d55ac328a
parent 61ddf1fa27039bc83a7e4be48a35a50ab2b83c78
parent 090027fb461c2a8ed1d3277da4f01e11565865ed
author Adam Seaton <aseaton@google.com> 1534383146 -0700
committer android-build-merger <android-build-merger@google.com> 1534383146 -0700

[automerger skipped] DO NOT MERGE Update platform security string to 2018-10-05 bug:112535135
am: 090027fb46  -s ours

Change-Id: I6d5364d1d0bcbc2960ea259a25ceeab4b24b4ead