| commit | d9e6976e609e9f5e79cf26b79524b670ac22c85b | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@android.com> | Wed Feb 17 21:22:52 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 17 21:22:52 2010 -0800 |
| tree | f4d901d22f470e7d421cde73033da6a191f7db17 | |
| parent | 2feec33de8d3735a14aee4a4ce1a214bbc329e21 [diff] | |
| parent | 0814cdd0c7e40ea95ad536eca8bdd36b39d40495 [diff] |
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.