OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy" into cw-f...
authorZach Johnson <zachoverflow@google.com>
Fri, 21 Apr 2017 21:07:06 +0000 (21:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 21:07:06 +0000 (21:07 +0000)
am: 1238329f28  -s ours

Change-Id: I5995614654f92977a6118ea365f1575e97acfbc1


Trivial merge