| commit | ab4835ee0df866a4f7982644742e2b758c50fdd7 | [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 | b9adce5258ebf6e6f5eebeaaaa8d13e8591e0fae | |
| parent | 6f4a52a3f7c6bd87e7109d741441bff332a445a4 [diff] | |
| parent | 00b17659bb4b2774580eea523c5f23b588105ab6 [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.