| commit | 5a68b62174f29a32d86398ea5b01a08d505b5e00 | [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 | 20e45a89b04fa25657dd67b6e566b16f023fdaa3 | |
| parent | b549d033615f065eba9ac50bd054339a38dba2aa [diff] | |
| parent | 3bcef9165ed75fe84393f3e8f8256db1c6a5a04e [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 Change-Id: Iebe29b3ef20104c407de1944110f3753487b3eae