Commit a8463ca5 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

[automerger skipped] Merge "Convert platform_testing to Android.bp" am: 8907bec9 am: 75d011f4 

am: e1f2dd41  -s ours

Change-Id: Ice6a22b4461bbf56741af210bee315a82cae0130
parents 7ce07441 e1f2dd41
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment