tree 301fbc82387ee8a6bd5ed38a9c0c793438430326
parent 82b968c6d9bad0ea42f5987f2fd3f28f8af07bc2
parent d81c8f26048597532bdfe6625f7d29a07b6b8af0
author Dan Willemsen <dwillemsen@google.com> 1542695970 -0800
committer android-build-merger <android-build-merger@google.com> 1542695970 -0800

Merge "Convert to Android.bp"
am: d81c8f2604

Change-Id: Ic7f2f82715ccfb3278c66a69fac18206eac2ac02