tree 8c6bd3feef8a5fa89c8c35029867bb3b16cb2cae
parent f70cc79eb14b75db9c0da077a4d54bd00fbdfc99
parent bf0ab0439cae12dbab43ed42d9a6ebae89c157a3
author Jeff Sharkey <jsharkey@android.com> 1515790303 +0000
committer android-build-merger <android-build-merger@google.com> 1515790303 +0000

Merge "Remove FIDTRIM." am: 35829f3968 am: c1d81682e1
am: bf0ab0439c  -s ours

Change-Id: I9ad9f730409747a0c8b724bdb81eb93802425309