| commit | e400a9bbf7a9dd9a798b132636f570c26c131073 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jun 14 21:44:38 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 14 21:44:45 2017 +0000 |
| tree | 71b78444295fbbcd889fb1d9d76319d08d3ad276 | |
| parent | 4b4fafa2560a912f0e7d04a5f6d01f84e840675d [diff] | |
| parent | a65125a70ec75f3a2e45cfa91440de92ea6ea2c9 [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 am: e4ff9c2edd am: c1b8dd23e6 am: ee4f4ff071 -s ours am: b549d03361 am: 6ce758683a" into oc-dr1-dev-plus-aosp