tree cddc159fdaa8e8f3bb62063dcbd0d6c6dcec0ca9
parent a7e07d32a6afaed70495878b8dfd81c64041d379
parent 48184679e8caa9d4c637187cd94f59d38929ac7a
author Andy McFadden <fadden@android.com> 1276552261 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276552261 -0700

am 48184679: am c12b0da0: am e0b23da8: Merge "Tweak sanity check." into gingerbread

Merge commit '48184679e8caa9d4c637187cd94f59d38929ac7a' into dalvik-dev

* commit '48184679e8caa9d4c637187cd94f59d38929ac7a':
  Tweak sanity check.