diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-08-31 18:30:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-31 18:31:00 +0000 |
| commit | 85bc1eb5807a3a92b6e73b510ccfac491e5a939c (patch) | |
| tree | 59fc163f7923f2e6fece3c5778b5845335e0fdea /docs/html/sdk/api_diff/21/changes | |
| parent | 812e424938c6ba329a27e6db7b483e00ac6c57d7 (diff) | |
| parent | 549a5d170e7fcad698ee8f36d20f8182447690cb (diff) | |
Merge changes from topic 'am-ee884cf0aecf458e82b1ef62075c2045' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev am: f7d8a1648b am: 666c7ae3e4
Add a whitelist of sockets on fork. am: 3764a260f0 am: 3f58724a46
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions