tree aaa418828eeadbb5964778fa822f22da1fec54ea
parent 52858488cd9dc1703f13be2c109a7679b9077bf3
parent e9fe8f02c9e41b83008b4b3b1db5f37334e8d405
author Sanket Padawe <sanketpadawe@google.com> 1502340934 +0000
committer android-build-merger <android-build-merger@google.com> 1502340934 +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

Change-Id: Ia09c5fcf0a691ee77a9012aed1d0145242299b7d