| commit | 72ffa0aa4bc8d4b83f34dc83ed13d6fb0d2cc816 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jun 14 22:12:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 14 22:12:47 2017 +0000 |
| tree | 71b78444295fbbcd889fb1d9d76319d08d3ad276 | |
| parent | 07c2623f7bed424d5a23700025fcffd6cc65f0b1 [diff] | |
| parent | 5c592288df972a0b320971fa4e63dad0b0e8302e [diff] |
Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours am: 81e5cd37ba am: e86071b524" into oc-dr1-dev-plus-aosp