tree 9a160b2b8b1997869f9c84c29ca82521709db661
parent bc91919d5cb70f7bcce89cf8d56eb7a429041e07
parent cb3d605b46306cd5a899177f7bae3da39d59d1bb
author Yi Kong <yikong@google.com> 1487053019 +0000
committer android-build-merger <android-build-merger@google.com> 1487053019 +0000

Pull upstream fix for CVE-2016-5552 am: 7247f6a70e am: 7013de23a1 am: 0398dec2b9
am: cb3d605b46

Change-Id: I4ab54a95b54968a38dc174dd89a45a27ee0fab23