| commit | 722377487dd334d99aa9ebd0358ea59447e97ecf | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:31:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:31:10 2017 +0000 |
| tree | 3315005962456e02f1aaf03d62b495b93de1b658 | |
| parent | 9e637d94a5f08cd9fb124e66e6ee97c26626d3fc [diff] | |
| parent | 092de7e668d70dc3adf7f364810150219a62cdd2 [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 Change-Id: Iaaecccf4c049ba23c31b22d64bbe48620d8ecf95