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)
commit22d3abd790110ddd0bf5bb67a729b44ac53f0813
treed7f0f27b237cb955db7fcc546e53f8923d4ebeb3
parent06dbac754ecd177d95d3d2d2f6db01a0e58a01bb
parent1238329f28a01f0518b70360318499b19a718dbf
Merge "DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy" into cw-f-dev am: b53535d61b  -s ours
am: 1238329f28  -s ours

Change-Id: I5995614654f92977a6118ea365f1575e97acfbc1