tree caa93e34530e7c52f51733a0f4de06501f36b30f
parent 0f9fc578b1055e318da7c0d6f0412b87560715ae
parent 3d92545c63fd24cb70f5efdc46ec8fee1915c75a
author eddy-sh.chen <eddy-sh.chen@mstarsemi.com> 1501839875 +0000
committer android-build-merger <android-build-merger@google.com> 1501839875 +0000

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

Change-Id: Id059bc1a5da6e2bfa6f8c1151eee0d0d27366737