tree 819c1f48ae7afb619fbaf461c98ea6a3fa2d4224
parent c5027d6e7deda5f0ad3f27c3c6a4ad68a8d795f4
parent f84b592ed359b1f5c56a4eb0254ce5d719da2fc0
author Adam Seaton <aseaton@google.com> 1504741410 +0000
committer android-build-merger <android-build-merger@google.com> 1504741410 +0000

Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329  -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61  -s ours am: 181a73eeb6
am: f84b592ed3

Change-Id: I3ee003f897c1bf3323cb318b9793e302a30d637f