commit | ba096b3177f927fa6f76e40bac6076c775391692 | [log] [tgz] |
---|---|---|
author | Xiao Rui <sherryxiao147258369@gmail.com> | Tue Jul 10 15:04:56 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 10 15:04:56 2018 -0700 |
tree | fb5129dbb34c995fb88b389d3f5ad925832245c9 | |
parent | 0ad1833d99e1632c090394feeac2e88eae724f61 [diff] | |
parent | 6551f1f0ead0366619091235401073993cdfe220 [diff] |
Merge "[automerger skipped] Merge "DO NOT MERGE - remove testStagefright_bug_34360591" into lollipop-mr1-cts-dev am: d564eb07ce -s ours" into marshmallow-cts-dev am: 6551f1f0ea -s ours Change-Id: I861628a19fae04e44eba46d1202255c8dfd9bdd2