tree 2542ae2ca479ae7e3c093b2f50fc9c6d17736512
parent 6d122df94c826e4e42d730d1eec37bf680067d86
parent dbf879c6b5707255095dfb42ad2d4da093d9e53b
author Rafi Ahmad <rafiahmad@google.com> 1523575601 -0700
committer android-build-merger <android-build-merger@google.com> 1523575601 -0700

[automerger skipped] Merge "Merge "Merge "Merge "Update test case name for new Stagefright test" into marshmallow-cts-dev am: 6a4edf34a0" into nougat-cts-dev am: 09e61c0aef" into nougat-mr1-cts-dev am: 6ea4e1e7d4" into oreo-cts-dev am: 4363a4df6e  -s ours
am: dbf879c6b5

Change-Id: I0b05006f59032e40710d0f3cfe17912ee40e9a84