commit | 07c2623f7bed424d5a23700025fcffd6cc65f0b1 | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Wed Jun 14 22:10:45 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 22:10:45 2017 +0000 |
tree | 71b78444295fbbcd889fb1d9d76319d08d3ad276 | |
parent | 60622b49a7644c8e78e97382d0965bb93181bd1f [diff] | |
parent | ee977641c1bc47f7d6b7c2f3476c336189709944 [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 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours am: 81e5cd37ba am: ee977641c1 Change-Id: I6d3aacd506803a5cae00ac1c2483fa02ed378132