OSDN Git Service

am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO...
authorRomain Guy <romainguy@android.com>
Thu, 18 Feb 2010 05:22:52 +0000 (21:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Feb 2010 05:22:52 +0000 (21:22 -0800)
commitd9e6976e609e9f5e79cf26b79524b670ac22c85b
treef4d901d22f470e7d421cde73033da6a191f7db17
parent2feec33de8d3735a14aee4a4ce1a214bbc329e21
parent0814cdd0c7e40ea95ad536eca8bdd36b39d40495
am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp

* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
  Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.