tree f22eb858866592d1ba43523b471b354efba4e168
parent 841cdeeeb486888a88bba8279f232174367c5667
parent 1f33db2233ede5d0566a5ccf3de2e0e67bf7459d
author Sanket Padawe <sanketpadawe@google.com> 1502342599 +0000
committer android-build-merger <android-build-merger@google.com> 1502342599 +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: b78a97b1a2
am: 1f33db2233  -s ours

Change-Id: Id94bbdce92fdd1c4ba7adf81b34a21a063742d1d