| commit | 4c04b87d176ca9c3b66aee9b4682c94a88fb669c | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Wed Jun 14 21:09:38 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 14 21:09:40 2017 +0000 |
| tree | fe642ad16d04adcef9474537fe0b5127fdb83a07 | |
| parent | 29052d250cc861d40aab06c355f5dd208f4f47a2 [diff] | |
| parent | 3eaf3e5a137abda06a0bb5ac569dce011d28a3af [diff] |
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