| commit | f846bcddb9c4f16db7efa146d80cff50674b97e5 | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Wed Jun 14 21:12:44 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 14 21:12:47 2017 +0000 |
| tree | 7ec3042d7b9d14586f01d43b60fe73417f3885ea | |
| parent | 0458c3b613ee9d8612cea15f20cc68e51dd32620 [diff] | |
| parent | f3d132a78673677d9b618a19ed8a7cdc71a88f52 [diff] |
Merge "Merge "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" into nougat-mr1-cts-dev am: 4c04b87d17 -s ours"