OSDN Git Service

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

Change-Id: If8a1bcdaa5c106394e4c00add45765d27c80e0ef


Trivial merge