Skip to content
Commit 73b2ac6f authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

[automerger skipped] Merge "Convert tests/**/Android.mk files to Android.bp,... 

[automerger skipped] Merge "Convert tests/**/Android.mk files to Android.bp, part II" am: e1f19a6e am: 3c611bc5
am: 21a06f23 -s ours
am skip reason: change_id I886b6536a0ef1c8d21f15ec7ff9fdb9784d5b865 with SHA1 89414e1e is in history

Change-Id: Icb46e2a1eec04013f97d45fc453c5ce4b7a519df
parents afe043d6 21a06f23
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment