| commit | 0c8848e273a1949e171fca4db013393bbebb3b09 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Oct 13 12:04:33 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 12:04:33 2009 -0700 |
| tree | fbfa7bdd8ab3971e640c40c5fd0c55cf78ae31f6 | |
| parent | bbd04159115ae2da4ddf0dbf21190903b26ac615 [diff] | |
| parent | 978a95129323da61aaf2dc0d39302ae0cb043ba2 [diff] |
am 978a9512: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp Merge commit '978a95129323da61aaf2dc0d39302ae0cb043ba2' * commit '978a95129323da61aaf2dc0d39302ae0cb043ba2': Show an error message when the remote side cancels the authentication Import revised translations. DO NOT MERGE