tree 6452a3e40a087f9133ccbc6ce9a58735ba8d8709
parent 339d787a43b9be7560729df7cc004cf43a7b474e
parent 313d3399e181bb1eb213cde006896c5ed253045c
author Yi Kong <yikong@google.com> 1496784703 +0000
committer android-build-merger <android-build-merger@google.com> 1496784703 +0000

Merge "Temporarily suppress user-defined-warning in external/sfntly" am: a217f56dac am: f4795d699d am: cee31ff94d
am: 313d3399e1

Change-Id: Ibc77173ce49b1b4132603d71aa75e98368e58382