tree 88dd68f6ce5bc53b320214daef1c82ca85812135
parent 447f1874b437d52a627868fffb89ff4e11d6fd68
parent 35829f396827137ccfd549b4f935a0b4867a4ceb
author Jeff Sharkey <jsharkey@android.com> 1515789817 +0000
committer android-build-merger <android-build-merger@google.com> 1515789817 +0000

Merge "Remove FIDTRIM."
am: 35829f3968

Change-Id: I02bb4438d08a34cf0f8e41a8a7fd2123c492be38