| commit | 6ce758683a51c6bcae114181e3ade6de6208b1df | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:38:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:38:45 2017 +0000 |
| tree | 007441b6b0694f0e84122130760aef845d1db9c7 | |
| parent | 1b37040509e7dc257f84dbb0fe265564b64a6097 [diff] | |
| parent | b549d033615f065eba9ac50bd054339a38dba2aa [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 am: 4c04b87d17 -s ours am: e4ff9c2edd am: c1b8dd23e6 am: ee4f4ff071 -s ours am: b549d03361 Change-Id: I4a19b301dcfe15bf5ac2f9f89646e9de25fecc5c