OSDN Git Service

Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1...
authorNarayan Kamath <narayan@google.com>
Fri, 9 Sep 2016 10:18:19 +0000 (10:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 10:18:19 +0000 (10:18 +0000)
commite59073096e7f106b420cd49c2250c3218a0b347d
tree29507f46183d2e056071de220c34067107126c77
parent646ee94421107fe744a74dc92bdde7fefdd6ac2d
parent00e808b06b71373cddc1fe7f2131f37b126386d7
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
am: 00e808b06b

Change-Id: I14939b5bf04ba47229e663b2ffc50543c5c6bc9a