Commit 215ed5c1 authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Rename testStagefright_b72165027 to... 

[automerger skipped] Merge "DO NOT MERGE Rename testStagefright_b72165027 to meet naming standards" into marshmallow-cts-dev
am: 9da4505f  -s ours

Change-Id: I3cf7e14153d832beafb0b18bf50cb750907d01e0
parents 17fbc643 9da4505f
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