tree f3571c3a531c94a605aee417df6ac9434ca2116e
parent 402e33e6e7b90d608151dc15fdc46ec8462f0ed5
parent e21cd46d4ddd10f7dc8672861510bda149fb7f3f
author Dario Freni <dariofreni@google.com> 1574094792 -0800
committer android-build-merger <android-build-merger@google.com> 1574094792 -0800

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

Change-Id: Ib99021238a22606e31ee4973f8a4d57a7d6d0298