| commit | bd83978ee73d2f5833b3bd26d78ac79eff81fbe6 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Jun 27 12:35:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 27 12:35:31 2012 -0700 |
| tree | 6da714f6efd0a84a4d77189d09a48416c6e36ee6 | |
| parent | 002cd0573efe2f0587452df53819132cc13dcf96 [diff] | |
| parent | c9cd45b321a834d20629ff9dc91fec2ccce79f7c [diff] |
am c9cd45b3: (-s ours) am d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'c9cd45b321a834d20629ff9dc91fec2ccce79f7c': Import translations. DO NOT MERGE