| commit | 32e2163cdb655feac0942a3e35d042cffebbd9ec | [log] [tgz] |
|---|---|---|
| author | repo sync <enh@google.com> | Sun May 02 16:11:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 02 16:11:54 2010 -0700 |
| tree | 1823e9101d264703efc9bb58369723dc8449c350 | |
| parent | d6f5d85c9a860c2f0f5e2ed5c104414f1eca5526 [diff] | |
| parent | 385ee6370db97d951fdd9708ab85ba345bf68981 [diff] |
am 385ee637: resolved conflicts for merge of f3565212 to froyo-plus-aosp Merge commit '385ee6370db97d951fdd9708ab85ba345bf68981' into kraken * commit '385ee6370db97d951fdd9708ab85ba345bf68981': resolved conflicts for merge of f3565212 to froyo-plus-aosp