tree cd6f0319717a176f030a7072534523587ae77b31
parent e2ef879534e0eb7365f1997d0935c8eccb9d28fb
parent 15ae819193c8c3f9dcd8428a5835f9b20429149b
author Brian Carlstrom <bdc@google.com> 1380043560 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380043560 -0700

am 15ae8191: am abcf7ae8: Fix overly restrictive assert

* commit '15ae819193c8c3f9dcd8428a5835f9b20429149b':
  Fix overly restrictive assert