| commit | f1a4618e99b26a588e15e8c467b21b3a1df74f64 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 03 09:16:51 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 03 09:16:51 2010 -0700 |
| tree | 4c34f9ff955d32f46b5f3e740f941d75654b0a58 | |
| parent | 7bea36bdeb9829a9d7ca4bce18b85c2125668817 [diff] | |
| parent | 324a98f1901fb84ec4c88196e01c3e14c2b5a4a4 [diff] |
am 324a98f1: merge from open-source master Merge commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4' into kraken * commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4': sh: Fix problem with stray '\r' character that was introduced in previous change