| commit | a7fe5ae7b3ba4b752ae100dcbc7c835352839730 | [log] [tgz] |
|---|---|---|
| author | eddy-sh.chen <eddy-sh.chen@mstarsemi.com> | Fri Aug 04 06:02:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 06:02:15 2017 +0000 |
| tree | 5049ec4e340fdc26696d5cca51352df11c183a05 | |
| parent | 89eb9029c5730afd406e0a8451157eb99b7b0d2b [diff] | |
| parent | 2e277b7a2d0dfc8b792bab9cdf3fe5f54976ef21 [diff] |
Merge "Disabling EncryptionTests on Android television" into marshmallow-cts-dev am: 5c74cceb07 am: 781f8b2028 am: 2e277b7a2d Change-Id: I096f0732d3be042c507cff80c815d24eba762386