diff options
| author | 2016-09-09 10:28:52 +0000 | |
|---|---|---|
| committer | 2016-09-09 10:28:52 +0000 | |
| commit | 24ffc9ab47f5f9f2afbec43f05b3423c7b01e37b (patch) | |
| tree | bd404b98eb13a6f123559c7f3e8653f78d57dea0 /libs/androidfw/AssetManager.cpp | |
| parent | 8f0cc3dd1329d3b386af1eea6470556540671561 (diff) | |
| parent | e59073096e7f106b420cd49c2250c3218a0b347d (diff) | |
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b
am: e59073096e
Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions