[automerger skipped] Merge "Convert Android.mk to Android.bp for CtsShim*" am:... (94a17806) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / evolution_frameworks_base

Commit 94a17806 authored Nov 18, 2019 by Dario Freni Committed by android-build-merger Nov 18, 2019

[automerger skipped] Merge "Convert Android.mk to Android.bp for CtsShim*" am:...

[automerger skipped] Merge "Convert Android.mk to Android.bp for CtsShim*" am: e21cd46d am: eb412a3a
am: b813ce00 -s ours
am skip reason: change_id Ie6e0df9f4f1365b5194e9748b325b421f838c65b with SHA1 fa54812b is in history

Change-Id: Idaa7a5a6f98f1c98e648d37032dbeaa5ad8313ee

parents 3d9b7b6b b813ce00

Hide whitespace changes

Inline Side-by-side

Please register or to comment