OSDN Git Service

Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb
authoryuanhao <yuanhao@xiaomi.com>
Thu, 19 Jan 2017 19:05:54 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 19:05:54 +0000 (19:05 +0000)
am: 8d3a8b1327

Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add


Trivial merge