[automerger skipped] Merge "Convert core/tests/featureflagtests/Android.mk... (574dce2f) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / evolution_frameworks_base

Commit 574dce2f authored Apr 04, 2019 by Sasha Smundak Committed by android-build-merger Apr 04, 2019

[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: b37e6398 -s ours
am skip reason: change_id If3f574bc15dedcd7880be605667297d257175c8d with SHA1 89eaa93a is in history

Change-Id: Id9578c9576d6eeb886cce16a78d4d60769787528

parents 8c3c0e8c b37e6398

Hide whitespace changes

Inline Side-by-side

Please register or to comment