tree 683ee4f2528ae822041d6dd6304ba1c00df3a978
parent 4474da7b7c78934097681ac6eabe64c400eb5aba
parent 71e6a6f12acf18e0cd1623b9b977ba410b4d1270
author Narayan Kamath <narayan@google.com> 1473324347 +0000
committer android-build-merger <android-build-merger@google.com> 1473324347 +0000

Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1
am: 71e6a6f12a

Change-Id: Ib162897a1428ab8c025a414eb0a3872327274f7a