am 7373775f: am 6d381dd7: (-s ours) am c090a5b8: Merge "Allow 2.3.6 in BuildVersionTest" into gingerbread

* commit '7373775fa756723a088ea4452497954b8f21a5c0':
  Allow 2.3.6 in BuildVersionTest