tree ed50e36d161438c0730eb27eb71ff8810d8e3f78
parent dda9bb00cd466b859f35c767944607bd851494b3
parent 0bc421667819f0ae0928834935af1534495f45f8
author Fabien Sanglard <sanglardf@google.com> 1479174684 +0000
committer android-build-merger <android-build-merger@google.com> 1479174684 +0000

Fix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169 am: 0517da2c5a am: b0dff427a1 am: 1852db9aa3 am: d4f7a66cf6 am: 0646227ad2 am: b4bd9606e0
am: 0bc4216678

Change-Id: Ica5b683c1c224e847db25d7ba192ba6d80ef9704