| commit | a1f02e1ad2c386666cac2018f30364eae08b5778 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 09 12:31:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:31:40 2013 -0700 |
| tree | 2819d0df63ebb34bd29d50d1fb81fc77d9581d47 | |
| parent | 65f596ae52b69369acef01d3bc6fb4af046f3ebb [diff] | |
| parent | ba9aa6c07b7ddd56772d392c65f32e0484a42be6 [diff] |
am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE * commit 'ce538a423a9c03555427923f98162b8436245acf':
