tree 2a0e9923215ebc843cb5dc55225eb2d509fee764
parent b78a97b1a28cc54fc868744a9c7f7ff4a5d52de9
parent b6daf50700f88d5f0f8e9ed685d1ae79939036a7
author Sanket Padawe <sanketpadawe@google.com> 1502341864 +0000
committer android-build-merger <android-build-merger@google.com> 1502341864 +0000

Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am: f0cbbbcdac am: ab379831bc am: a5eeaef8ee am: 6c6d404fb5 am: 96582369cb  -s ours am: 7421b551d3
am: b6daf50700

Change-Id: Ied5f874296be8e7406998e0d85be63e8e7e3a1c7