am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread

* commit 'f89c37295db5df34c014e0791c976cfa94509068':
  Merge 6f2fb570 from honeycomb. do not merge.
This commit is contained in:
Xavier Ducrohet
2011-03-15 11:57:35 -07:00
committed by Android Git Automerger

Diff Content Not Available