| commit | ceef2da52f5dedab1929babcad1c774dcb175b0d | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Jun 28 10:19:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 28 10:19:20 2012 -0700 |
| tree | d7443ce5cda3a7b0b8f77d1ee3e0b310ce33bc38 | |
| parent | d292508a47f2901d0946ef69c0c96fcd6051e7d4 [diff] | |
| parent | 8a2f839e36d79eaa904e91a6909c1c0832f927f3 [diff] |
am 51e332a8: (-s ours) am 7aeb8cd4: Import translations. DO NOT MERGE * commit '51e332a88899b86c2f706e8ad164877665fe319a': Import translations. DO NOT MERGE