am 89ee8c72: Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread

* commit '89ee8c72f35907a3546fb067eef2bdc8e134d53b':
  SDK for 2.3.1 -- DO NOT MERGE