tree 1c4c69f40af7547637352d60ed0b0e7864842bf7
parent 3b6fbaf5a27f250e9074aa840bad6bac6f1ebb7e
parent 35c05cdef6ffdece03f1e6b9dd22f999bbc9f4f0
author Brett Chabot <brettchabot@google.com> 1411681215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411681215 +0000

am 35c05cde: Merge "Handle ignored + assumption failure" into lmp-dev

* commit '35c05cdef6ffdece03f1e6b9dd22f999bbc9f4f0':
  Handle ignored + assumption failure