| commit | 3af8c59b7151cd84f3297946e7ce72418cdcf833 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 03 15:08:23 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 03 15:08:23 2010 -0700 |
| tree | 2c354c8e252a314dac912284270c0785512bc05d | |
| parent | d5578fb652bd41bb978ae3b7727e4fde639b728f [diff] | |
| parent | a8a21488630980c1d2a2152d0ac39bd7978879e2 [diff] |
am a8a21488: resolved conflicts for merge of 7b6e6fa5 to kraken