tree 6452a3e40a087f9133ccbc6ce9a58735ba8d8709
parent 5a188a8930182d27d39864a7b42f21c36cb28c1e
parent cee31ff94db46266d334b7248760aa4042396497
author Yi Kong <yikong@google.com> 1496784403 +0000
committer android-build-merger <android-build-merger@google.com> 1496784403 +0000

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

Change-Id: I9c8f891aef331a2e8d81df93d799f8356b6bd525