tree caa93e34530e7c52f51733a0f4de06501f36b30f
parent 0f9fc578b1055e318da7c0d6f0412b87560715ae
parent 55c2ede7566e4ce42fcf5a4dbfc474e7eaaa5e55
author Android Merger <android-build-merger@google.com> 1501839887 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1501839887 +0000

Merge "Merge "Merge "Disabling EncryptionTests on Android television" into marshmallow-cts-dev am: 5c74cceb07  -s ours" into nougat-cts-dev am: 3d92545c63" into nougat-mr1-cts-dev