am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread

* commit '48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
  Merge 6f2fb570 from honeycomb. do not merge.