| commit | 41d96a5c2b709211ccc1ff6c1eb66faf7cc678cf | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:31:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:31:09 2017 +0000 |
| tree | 5abfc2b77a6561e8babf67aea37a3771c13af04f | |
| parent | c1b8dd23e622ead9b030763561734f46b98807aa [diff] | |
| parent | 816d134e4efb4934e39667595288b155bb45678b [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" into nougat-cts-dev am: 2846f85009 -s ours am: 98c75d0dc2 am: 8b6d7007c7 am: 816d134e4e Change-Id: I24ba719e9992b3a8ee69b6e495d3ab0fd9167d1e