tree 767355f2f0fe7745705066f56253d58caac59a05
parent db17d24d696309827a68445ab90c12022aa545bd
parent 9d3d44fa31e276f9ca13c741398c6e3c686213a3
author Chris Craik <ccraik@google.com> 1430176080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430176080 +0000

am 9d3d44fa: Merge "Fix bitmap filtration tests to be more stable" into lmp-mr1-dev

* commit '9d3d44fa31e276f9ca13c741398c6e3c686213a3':
  Fix bitmap filtration tests to be more stable