Commit 1120b1ef authored by Xiao Rui's avatar Xiao Rui Committed by android-build-merger
Browse files

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

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

Change-Id: I4b43ae4d78d972344c99b1bf33ee19838057b558
parents 1e7b5027 6551f1f0
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