Android 2.3.5 release 1
am 701ad7cc: (-s ours) DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master

Merge commit '701ad7cca713ec5054e420bde1b32b86d18ef08b' into gingerbread

* commit '701ad7cca713ec5054e420bde1b32b86d18ef08b':
  DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master