summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Merger <android-build-merger@google.com>2017-05-17 19:26:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-05-17 19:26:15 +0000
commitf4324fa2d06399f5b8673b03f13947be86b8867f (patch)
tree9a5f4a2ffa77d1e4eee6fd2878dac14c4e162651
parentbfdf28fd87a0c8367683d58611f2301510bb7b69 (diff)
parent670e2b429698a7166ee0eec22412c3991fd951ce (diff)
downloadcts-n-iot-preview-4.tar.gz
Merge "Merge "Merge "Merge "Merge "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets" into lollipop-mr1-cts-dev am: 24f2268a55 -s ours" into marshmallow-cts-dev am: 91cf9e2c6c -s ours" into nougat-cts-dev am: 0eeb28a011 -s ours" into nougat-mr1-cts-dev am: 5f2e750804 -s ours"android-n-iot-preview-4n-iot-preview-4
0 files changed, 0 insertions, 0 deletions