OSDN Git Service

Merge "Allow SMS and calling for demo users" into oc-dr1-dev
authorChristine Franks <christyfranks@google.com>
Wed, 9 Aug 2017 20:15:33 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 20:15:33 +0000 (20:15 +0000)
commit966f37ae239bfcb0864dda826c557047c4061f85
treef785d540aa310ed81b9e5e930d93f6c2b9e5347a
parent9d836b6312bcea26b1355b4749808ec880e85c08
parent4387d3a523fde808e6bd9d301102cfb06aea7d87
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
am: 4387d3a523

Change-Id: I163963c15c009eaf70907203cf941e182409eafc
services/core/java/com/android/server/pm/UserManagerService.java