diff options
author | Daniel Xie <dxie@google.com> | 2016-07-11 03:57:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-11 03:57:28 +0000 |
commit | 95aa24eae75a0a417078689d25d960ea50707b5f (patch) | |
tree | 573e9172fd5d1a13f3a5d85be54d9f40eca87357 /tools/cts-java-scanner | |
parent | 5c74100324b933a2592cf96ea0077473245b3278 (diff) | |
parent | 9d7578092f28ef672278fee35b3a1fda7c00e627 (diff) | |
download | platform_cts-android-cts-5.1_r9.tar.gz platform_cts-android-cts-5.1_r9.tar.bz2 platform_cts-android-cts-5.1_r9.zip |
Merge "DO NOT MERGE: Disable media encode/decode test." into lollipop-mr1-cts-releaseandroid-cts-5.1_r9android-cts-5.1_r10
Diffstat (limited to 'tools/cts-java-scanner')
0 files changed, 0 insertions, 0 deletions