tree 301fbc82387ee8a6bd5ed38a9c0c793438430326
parent 9839be66bf196261c6a540f4ca4c491973e84c20
parent 5cbed885dd2dd507fb18976b094173d8434807d1
author Dan Willemsen <dwillemsen@google.com> 1542696267 -0800
committer android-build-merger <android-build-merger@google.com> 1542696267 -0800

Merge "Convert to Android.bp" am: d81c8f2604
am: 5cbed885dd

Change-Id: I3e22c05a39923da8e6d5718e077327dd53a6e438