| commit | ff121670b7f5f886e12aad5a46e8ad05dc419ca3 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Apr 27 11:20:31 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 27 11:20:31 2010 -0700 |
| tree | 17f7f9989f9438a242ad27a2d8ac82a26aa8502f | |
| parent | 7ce7cfc32da1e5c2774ac62261a738fbb012ea99 [diff] | |
| parent | 34483a0f6e1db9b0d96abc8b6dd056ec385f82b6 [diff] |
am 34483a0f: resolved conflicts for merge of 5a8f877c to kraken