| commit | ee977641c1bc47f7d6b7c2f3476c336189709944 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 22:05:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 22:05:48 2017 +0000 |
| tree | 007441b6b0694f0e84122130760aef845d1db9c7 | |
| parent | 9288e0fb810e2817561de48517b2689c55a4a06b [diff] | |
| parent | 81e5cd37ba8d6265a545ee429c01f79c37b0add7 [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 Change-Id: I1ccfd15f7b418352eebd20b8cbaf1ac414af62f6