| commit | f29768cbd6a503b726dfcdaea7344c8b174bda5f | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Nov 06 05:03:47 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 06 05:03:47 2015 +0000 |
| tree | 04caf16759e73ac84bdabad74003b812902adc8d | |
| parent | 3de7490d2cab9879407f5fc93ca44520b6b597ee [diff] | |
| parent | 72125808741cb816347e1022bf3c650be6161f9f [diff] |
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e am: 03fd9a1c84 am: cf2efdc4b1 am: 0734080364 am: 7212580874 -s ours * commit '72125808741cb816347e1022bf3c650be6161f9f': DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10