commit | fdbc4e70dd6320ec5ad2543f61f9af685d3ff348 | [log] [tgz] |
---|---|---|
author | Ying Wang <wangying@google.com> | Wed Jun 20 11:47:54 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 20 11:47:54 2012 -0700 |
tree | c413c3bfb780d3e15e926e6039bbf0311c94efaf | |
parent | dfe94934c177fd38e8ab7835dd4978154c922828 [diff] | |
parent | 5e2fe9544e8d4a48cad1a7626b808e291981f173 [diff] |
am 5e2fe954: (-s ours) am 094e99c9: Import translations. DO NOT MERGE * commit '5e2fe9544e8d4a48cad1a7626b808e291981f173': Import translations. DO NOT MERGE