OSDN Git Service

Merge "Handle getActiveAdmins() == null safely." am: d46153c3d3
authorRobin Lee <rgl@google.com>
Wed, 13 Dec 2017 17:28:34 +0000 (17:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Dec 2017 17:28:34 +0000 (17:28 +0000)
am: 70a6dfd647

Change-Id: I98ccb0e4eb0882e10c0266d3f1fbbddaa1073db8


Trivial merge