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

* commit '48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
  Merge 6f2fb570 from honeycomb. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-03-15 11:37:01 -07:00 committed by Android Git Automerger
commit acfbfbc079

Diff Content Not Available