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

[automerger skipped] Merge "Convert core/tests/featureflagtests/Android.mk... 

[automerger skipped] Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" am: 2e96d3f5
am: 8b788b21 -s ours
am skip reason: change_id If3f574bc15dedcd7880be605667297d257175c8d with SHA1 89eaa93a is in history

Change-Id: I066c4422eb1ae87f0e5943063201466756b3891e
parents d80730f5 8b788b21
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