Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev am: 8db0691129

am: 32df75b686  -s ours

Change-Id: I9fd9f4f353b104a0d2df5263000dce2d86acd3e7
This commit is contained in:
Sunny Goyal
2017-07-08 23:08:36 +00:00
committed by android-build-merger

Diff Content Not Available