| commit | 8b56f108f373fc17ae43aab775c426c147ef3bc8 | [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 | 57e49da0b90565c76a1394b8a875fc22e9ae0369 | |
| parent | a525a0d75d9577cf3418fd7b89eecc54593eadbf [diff] | |
| parent | ce538a423a9c03555427923f98162b8436245acf [diff] |
am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE * commit 'ce538a423a9c03555427923f98162b8436245acf':