| commit | a65125a70ec75f3a2e45cfa91440de92ea6ea2c9 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:43:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:43:13 2017 +0000 |
| tree | 71b78444295fbbcd889fb1d9d76319d08d3ad276 | |
| parent | accaccc6ec3815d61a386982d31d090ec0e60412 [diff] | |
| parent | 6ce758683a51c6bcae114181e3ade6de6208b1df [diff] |
Merge "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" into nougat-cts-dev am: 2846f85009 -s ours" into nougat-mr1-cts-dev am: 4c04b87d17 -s ours am: e4ff9c2edd am: c1b8dd23e6 am: ee4f4ff071 -s ours am: b549d03361 am: 6ce758683a Change-Id: Ia73476daff3a6dcffd630f2fb1348156c3a3fe40