Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev am: 32e6da5b84

am: ea02035c4d  -s ours

Change-Id: I8c9cbbf10e1058180bdbb127d9657c4f6fe9c886
This commit is contained in:
Steve McKay
2017-01-26 04:44:46 +00:00
committed by android-build-merger

Diff Content Not Available