tree 42fa19b35b019b6698cac93ef94cec9f6b5133e4
parent 4c5a49e5ae7cdd6a96a78fdfa27bced723282e3d
parent fc36654a469e0e2c48f48005719c0741189b4372
author Basavapatna Dattaguru <dattaguru@google.com> 1297466226 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1297466226 -0800

Merge "Video Editor CTS Test Code: annotation suppress"