OSDN Git Service

Merge "Adding key to individual entries in ManagedServiceSettings so that it can...
authorSunny Goyal <sunnygoyal@google.com>
Sat, 8 Jul 2017 23:05:38 +0000 (23:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 8 Jul 2017 23:05:38 +0000 (23:05 +0000)
commit32df75b686333da17f341cf76881305c310ebb7c
tree10f983a88d7a6e4e76e4ffc83831425f778c3e17
parentd8b92b4d821d7914407b67a67778d8a0deef9835
parent8db0691129f5ce27c2d184f0744283c5bff6d6fd
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

Change-Id: If1c570e8f469ba2af39d34d016b53daa49de499b