| commit | 2f860f1536a53b4dc49bfa1792d2ca56ecc03309 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Mon Apr 04 17:43:59 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 04 17:43:59 2011 -0700 |
| tree | 65c72a4036595fe03379b499bca2b7307551c5b0 | |
| parent | 76fb4bd31a7461f93d1beda9cec009097775b322 [diff] | |
| parent | 63fff9c758991e7753431297d169bd61db8e1dd6 [diff] |
am 63fff9c7: resolved conflicts for merge of 3a6928aa to gingerbread-plus-aosp * commit '63fff9c758991e7753431297d169bd61db8e1dd6': Import revised translations. DO NOT MERGE