| commit | 60ed3a6cb86f429c308ccfbe19172f9cedd5a297 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:40:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:40:40 2017 +0000 |
| tree | cfff71abd8153ebf8be1af8d5de608dbcab89361 | |
| parent | 8b6d7007c75365e3a7a13efecf9345439ca57e84 [diff] | |
| parent | 92e50a4a354da9afc8483e76b76897ec245ff9d2 [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 Change-Id: I46c8596a10f0bfea1a3434eda927dcf2d02c032b