tree 4783d999a0e51253e63423033c8a8037977f20c0
parent 6d6c6b49e9427796cfe67f9f252646d1dfce6e42
parent 1a6ca333ef966cbdd34eb52f2f67af0a381118d6
author Dan Willemsen <dwillemsen@google.com> 1557366658 -0700
committer android-build-merger <android-build-merger@google.com> 1557366658 -0700

Merge "Convert fir to Android.bp"
am: 1a6ca333ef

Change-Id: I730040faab53bc1b8f1407a2bfad614883e200ec