| commit | 81e5cd37ba8d6265a545ee429c01f79c37b0add7 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 22:00:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 22:00:42 2017 +0000 |
| tree | 20e45a89b04fa25657dd67b6e566b16f023fdaa3 | |
| parent | 5a68b62174f29a32d86398ea5b01a08d505b5e00 [diff] | |
| parent | a5468ae54ef5e3ba7e252e3c171bfe8afde573b3 [diff] |
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 Change-Id: I24f8e07340b22087450c758221e3823bfd64a2eb