tree f6ed5b977db94eed896365ed6c8c3fad6b96c7b5
parent 269106b9497e9d7c4f3802914668f101dc78583f
parent 181a73eeb6878cc5f3ff73be158c918967f271ce
author Adam Seaton <aseaton@google.com> 1504741164 +0000
committer android-build-merger <android-build-merger@google.com> 1504741164 +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

Change-Id: If43281749e89e68fdf6cbc55ec5966da988c9aa9