tree 245a8705ea76969ad234f78ac3ec630751ff85a1
parent 02c55b67314cacc906d35236a4b123254acfb224
parent 86d7d79d457c2fcbdc4d1309c8d4cc30589e53ed
author Android Merger <android-build-merger@google.com> 1485208782 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1485208784 +0000

Merge "Merge "DO NOT MERGE: StagefrightTest: add test for bug 32577290" into marshmallow-cts-dev am: 3170da8801  -s ours" into nougat-cts-dev