tree 029cc0fc1c7bb37d5b85a753c125ffee36278a32
parent 9db3af0ebadd8d520e388ba727f4971f8a089a0a
parent fb0e930b5b939b3f5a6289eceea6c977e385273c
author Jeff Brown <jeffbrown@google.com> 1339201365 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339201365 -0700

am fb0e930b: am 5611f58a: Merge "Remove bad assert from a test." into jb-dev

* commit 'fb0e930b5b939b3f5a6289eceea6c977e385273c':
  Remove bad assert from a test.