tree 6047ee853e640b0d6d3accb76bd03300af636ae0
parent 78ba3c4677ba6cb19dc1ce666375deb73b598709
author Daniel Xie <dxie@google.com> 1446785039 -0800
committer Daniel Xie <dxie@google.com> 1446785119 +0000

DO NOT MERGE: disable 
android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as 
it fails on nexus 10

Change-Id: Ie6505b646d4a5df5d23b5c76bc5d735ef3a4c5f3