| commit | 591031887309b022de46fd06647ccccd0cdc10fe | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu May 31 11:39:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 11:39:30 2012 -0700 |
| tree | fe6e085d17928d92d7ca5e7dc67789419817b7e6 | |
| parent | c58866ecf9dc57b6991746e6bf9d17641a3f3424 [diff] | |
| parent | 3d5fcb7ba8b0fbf3c84aec10accba1ab0895d934 [diff] |
am 3d5fcb7b: (-s ours) am 8722692e: Import translations. DO NOT MERGE * commit '3d5fcb7ba8b0fbf3c84aec10accba1ab0895d934': Import translations. DO NOT MERGE