tree bb3c3556e9703e9ab194a06b30d28ede26fd3ace
parent 3aac281f7a41cc53150c04399b541c3926fbae13
parent 6e995471bd916fe1efbc7d1c0e3c49d2e48dad06
author Daniel Xie <dxie@google.com> 1436918410 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1436918411 +0000

Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev