[automerger skipped] Merge "Convert SettingsLib tests to Android.bp" am: d0de38b222 am: ec3a29c544 -s ours

am: 58fa5df312 -s ours
am skip reason: change_id I69b5b2c6c22f93a31ef978710867226cb1ba3db0 with SHA1 fdec9ffee0 is in history

Change-Id: I0d7216679a26ca84a3a7362354cedeef88e0ac60
This commit is contained in:
Colin Cross
2019-05-30 14:33:42 -07:00
committed by android-build-merger

Diff Content Not Available