| commit | 9288e0fb810e2817561de48517b2689c55a4a06b | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:45:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:45:41 2017 +0000 |
| tree | 007441b6b0694f0e84122130760aef845d1db9c7 | |
| parent | 6ce758683a51c6bcae114181e3ade6de6208b1df [diff] | |
| parent | 5a68b62174f29a32d86398ea5b01a08d505b5e00 [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 am: 3bcef9165e -s ours am: 5a68b62174 Change-Id: I494e143544884fb2d7298b9f4895c1425edfcd62