| commit | c126d6ca8c48be89893c7564d4bae7435ffb3c7f | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Tue Oct 13 11:50:07 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 11:50:07 2009 -0700 |
| tree | 15f53ce39046d1bb2ac8ea5f69f4101bab0bab1f | |
| parent | 7dfdb45d4204ff7373fe89ff8633a3637278b5be [diff] | |
| parent | 9cd75176dd469ffb15b094e496fa53ffd60e8f1c [diff] |
am 9cd75176: am f5169178: am ef292158: We should handle all four cases when strip the "client". We were incorrect in the third case. Merge commit '9cd75176dd469ffb15b094e496fa53ffd60e8f1c' * commit '9cd75176dd469ffb15b094e496fa53ffd60e8f1c':