am 6c465bbe: (-s ours) Cherry-pick f1dee1 from master for SDK. do not merge.

* commit '6c465bbe805354dc0101d2cac1d7ce374bb336a0':
  Cherry-pick f1dee1 from master for SDK. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-10-03 10:43:49 -07:00 committed by Android Git Automerger
commit 22b27f006b

Diff Content Not Available