tree f22eb858866592d1ba43523b471b354efba4e168
parent f0730259c79aab4eedd8a575b4491cb37c8e8c03
parent 802f7ecf91983dab94430e59164d843e5928c6d3
author Sanket Padawe <sanketpadawe@google.com> 1502342619 +0000
committer android-build-merger <android-build-merger@google.com> 1502342619 +0000

Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am: e66a47c150 am: 957626f82d am: ddc6f6427e am: 0756964d91  -s ours am: b8484b0fe3 am: e9fe8f02c9 am: 71eb7902d3 am: 77142523ff am: 009637231d  -s ours am: a50308d10b am: 14e2eebe88 am: 162436785f
am: 802f7ecf91  -s ours

Change-Id: Iaab91d84a1b465bc06d90201ca5bcadf25d30a89