Merge commit '1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp * commit '1fed48849dcadedb68211c5d55c1b452d05b98bc': Move to 1.6_r2 (DO NOT MERGE)
This commit is contained in:
Merge commit '1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp * commit '1fed48849dcadedb68211c5d55c1b452d05b98bc': Move to 1.6_r2 (DO NOT MERGE)