tree 35a16905ca4f620fe7b7cd84c7db729c6b779d58
parent 2111d5165988de7552132d95e13721ff98aac10f
parent 2cb72357f1aebf278fb589ede61bfe045c7f8cc4
author Yin-Chia Yeh <yinchiayeh@google.com> 1446253838 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1446253838 +0000

Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev