| commit | 523d789d06ba709586ca04a72a8946125ccaac03 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jun 14 21:51:41 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 14 21:51:45 2017 +0000 |
| tree | 71b78444295fbbcd889fb1d9d76319d08d3ad276 | |
| parent | c46b97786380561111ad6f5559bd3face0f50c7d [diff] | |
| parent | a70dcafdde6a0757d56feb72edf3de5ed1d603e2 [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 am: 98c75d0dc2 am: 8b6d7007c7 am: 816d134e4e am: 41d96a5c2b am: 3bcef9165e -s ours am: 5a68b62174 am: d50db10a37" into oc-dr1-dev-plus-aosp