tree d3da92e7340f9dec1536be5c74677e19d9a11721
parent 1b8a4681ea84c558ce95ef4dab3f29e9d1b4829f
parent ac1407a76d4601eb3e8b7cb03a65fdc12416ca29
author Android Merger <android-build-merger@google.com> 1506404728 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1506404728 +0000

Merge "Merge "Merge "Merge "DO NOT MERGE: Make the tests permissive for N" into nougat-cts-dev am: 4b5d593188  -s ours" into nougat-mr1-cts-dev am: 840d9009e1  -s ours" into oreo-cts-dev am: dbe7ba5322  -s ours"