am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread

* commit '14e1f523c673315cbc3167448ce9252b455d252c':
  Merge c12b4093 from honeycomb. do not merge.