| commit | 42cfc2cc059eb7828821f6fecff71cf7c2f78579 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 30 15:54:38 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 30 15:54:38 2010 -0700 |
| tree | 69694f07802f5723cde9be049e46d48ec38a6fb8 | |
| parent | ba634dc9f70af3024e8db566b7a223066ee4527e [diff] | |
| parent | 60faafcf01ff7f4179cdcaefd24b10ac4ee7f692 [diff] |
am 60faafcf: merge from open-source master Merge commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692' * commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692':