Commit 089782a3 authored by Xiao Rui's avatar Xiao Rui Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE - remove... 

[automerger skipped] Merge "DO NOT MERGE - remove testStagefright_bug_34360591" into lollipop-mr1-cts-dev
am: d564eb07  -s ours

Change-Id: I392ab4af20d7c52f3adbd154bf3933a1679077d7
parents 9990deda d564eb07
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment