Commit 1838b604 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
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 skipped: 281e57bb skipped: 14fd67fd

Change-Id: I3ac4e1707f80a1d7fb2a8931abf7ff8f5b874696
parents 99b1f999 14fd67fd
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