OSDN Git Service

Merge "Adding key to individual entries in ManagedServiceSettings so that it can...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sat, 8 Jul 2017 23:01:36 +0000 (23:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 8 Jul 2017 23:01:36 +0000 (23:01 +0000)
commit8db0691129f5ce27c2d184f0744283c5bff6d6fd
treedb594aac8e32e96c1a887190119a485b9540b76f
parent69d6f2840f8e1437e53302ec1f95fd6108f03b08
parent93fb5863e5b27dab5a54cc5666d75398a4f4e6fd
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