| commit | 17aca35d84322d0922f7e846569b1ef9ba418d4c | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Fri Feb 10 10:13:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:13:19 2012 -0800 |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
| parent | 809b41a84e872e8d0e9c28474ed3239918832e5d [diff] | |
| parent | f68eb209240d5742bbd8e38beea4a5cb64ed59ef [diff] |
am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '448249d1a7e0b871b9a9db49a45e0e51f6d36d65': Import translations. DO NOT MERGE