Skip to content
Commit dbe517fb authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

[automerger skipped] Merge "Convert FrameworksCoreTests to Android.bp" am:... 

[automerger skipped] Merge "Convert FrameworksCoreTests to Android.bp" am: 5f912ecd am: dc90eebe
am: 2b626c79 -s ours
am skip reason: change_id I2f83f381f914afeff7cdbbb9d8faa67551ed0c61 with SHA1 85e2be0e is in history

Change-Id: Ic592193559cb1084a15ddc2efc7da04f01eefddc
parents a6e053e3 2b626c79
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