OSDN Git Service

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

Change-Id: I2399d1832fe643ef0057c2c4d0b0fa4bf860e760