am 89aa0ebf: (-s ours) Ignore 0c3d5d95 from gingerbread

* commit '89aa0ebfb86d15672ab297264ee3bf9fd3e18ea1':
  2.3.1