tree 6452a3e40a087f9133ccbc6ce9a58735ba8d8709
parent e87ae78393a88a6f582130e0978ae20fca535802
parent f4795d699da4d06fe1f43d90800269cd0f4f7085
author Yi Kong <yikong@google.com> 1496784153 +0000
committer android-build-merger <android-build-merger@google.com> 1496784153 +0000

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

Change-Id: I552d253dff767382ad18419796941587dcf3c2e7