Android (Google) Code Review 3beb2fa488 Merge change I620f67c8
* changes:
  Cherry-picking change I476e5a00 from eclair-china
2009-12-15 10:45:07 -08:00
..