tree 801fb20cf47cfcb92693b68dcb9a923bf110d49c
parent 11b95f11974612757cacd6418d3c7e25e5b84e40
parent 99dd08dfdd6c3be2d6fab0f34d58cd55a5e73dfd
author Adam Seaton <aseaton@google.com> 1504795724 +0000
committer android-build-merger <android-build-merger@google.com> 1504795724 +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
am: 99dd08dfdd

Change-Id: Ic4886449f06ef51a9d03f2394a406198348dae26