am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread

* commit '405cb57019e0b0b9c2049c2b06537c0f4981fc37':
  Merge c12b4093 from honeycomb. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-03-15 11:57:30 -07:00 committed by Android Git Automerger
commit 47b876d150

Diff Content Not Available