Commit 9b97bfe6 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 skipped: 1838b604

Change-Id: I342bcbb3a31c0131274175033c3e0731c889ce82
parents 459f8bab 1838b604
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