tree 74d5995a714db9d1d6ee26d867819c01b4f1a8fa
parent d3e4bc90040a65a2639d10228dea4fe22f84c9d8
parent eb412a3aa1c5d254484afa33dfeabe1c6ad02764
author Dario Freni <dariofreni@google.com> 1574095225 -0800
committer android-build-merger <android-build-merger@google.com> 1574095225 -0800

Merge "Convert Android.mk to Android.bp for CtsShim*" am: e21cd46d4d
am: eb412a3aa1

Change-Id: Ic32aaa08d39448f5e3baed25d574c965c7186d3c