[automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours

Browse Source

am: c1b598b218 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: Id148a1ec77e363cc5e7f2cbe94adb172377107af

...

This commit is contained in:

Colin Cross

2019-05-30 14:53:04 -07:00

committed by android-build-merger

parent cffcc4cb42 c1b598b218

commit 243ed56948

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available