tree 2122801188ea224d23c278f84c2909107c2df2cd
parent 3d9b7b6b8af2aec3ad49abbfcb7fa9cd00ee9faf
parent b813ce00e5f84def5322fb6c5df82dcf1eb4de99
author Dario Freni <dariofreni@google.com> 1574095506 -0800
committer android-build-merger <android-build-merger@google.com> 1574095506 -0800

[automerger skipped] Merge "Convert Android.mk to Android.bp for CtsShim*" am: e21cd46d4d am: eb412a3aa1
am: b813ce00e5 -s ours
am skip reason: change_id Ie6e0df9f4f1365b5194e9748b325b421f838c65b with SHA1 fa54812b1f is in history

Change-Id: Idaa7a5a6f98f1c98e648d37032dbeaa5ad8313ee