commit | 3bcef9165ed75fe84393f3e8f8256db1c6a5a04e | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:36:10 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:36:10 2017 +0000 |
tree | 7def9ab333346b771f5c7a2bc517f1fc5ca2ca52 | |
parent | ee4f4ff071a25d4ca1315e92d7f5a5faa426e950 [diff] | |
parent | 41d96a5c2b709211ccc1ff6c1eb66faf7cc678cf [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 am: 41d96a5c2b Change-Id: Ia916d31d3e6a7fa990494fbe4a2c16a16149ff20