| commit | 69f7aa5575243ccbf6d4e546208fbec7eb69f205 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Jun 14 21:22:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 21:22:42 2017 +0000 |
| tree | e95953c6db97b199552acdb21d4902d00519b0b2 | |
| parent | 47aa8f08a6b449c372941723e0c7cba49cd7b9bd [diff] | |
| parent | 2888b89af866703b6a717a6c043fd3141d5e2e92 [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: f846bcddb9 -s ours am: 2888b89af8 -s ours Change-Id: I8b75fdac43694afaa00d823efb23b822e97d5e43