OSDN Git Service

DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy am: c61ef79a79 -s...
authorZach Johnson <zachoverflow@google.com>
Fri, 21 Apr 2017 21:06:23 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 21:06:23 +0000 (21:06 +0000)
am: 31dfa53ba0  -s ours

Change-Id: Ie93beab51ec5e03d58c3df28c9d117450e8a8a5f


Trivial merge