am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread

* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
  Merge 05b7b69c from honeycomb-mr1. do not merge.