am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)

Merge commit '1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp

* commit '1fed48849dcadedb68211c5d55c1b452d05b98bc':
  Move to 1.6_r2 (DO NOT MERGE)
This commit is contained in:
Xavier Ducrohet
2009-09-29 18:36:07 -07:00
committed by Android Git Automerger

Diff Content Not Available