tree 84b52499d48dd81387987c7e16bd035def7fc026
parent 2bb3c7782ac06567390a83289e68832de0ff8d3c
parent d2b8adcb5d615cd59f6060abff6395c694692e3c
author JP Sugarbroad <jpsugar@google.com> 1517945277 +0000
committer android-build-merger <android-build-merger@google.com> 1517945277 +0000

Merge "Merge "Merge "Revert "DO NOT MERGE StagefrightTest: add test for bug 23270724"" into marshmallow-cts-dev am: 6bc2fe3818  -s ours" into nougat-cts-dev am: ecaf21f39a  -s ours" into nougat-mr1-cts-dev
am: d2b8adcb5d  -s ours

Change-Id: Ie234b28acc0e62db8637e1c2c5be4cc4014fb93d