[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default am: 12c9be1255 -s ours

am: c843167b3f  -s ours

Change-Id: I503f6e405a90d2e2b83794310da8f45bc4aa91c3
This commit is contained in:
Adrian Roos
2018-08-21 18:44:07 -07:00
committed by android-build-merger

Diff Content Not Available