tree 2efb78ac428dd8b4d9e5472fdb87c0914bf63623
parent 15fbf9786dbdcd20475b0c12940139ad3d66b6e2
parent 97a5480a1d81f399c07b3142d2809203047a5c1c
author Christine Franks <christyfranks@google.com> 1502309195 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502309195 +0000

Merge "Allow SMS and calling for demo users" into oc-dr1-dev