| commit | ccefcbebe0dd67b124ed7132dc40fa02b62dec06 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Jul 16 14:30:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 16 14:30:45 2012 -0700 |
| tree | 8aeaf608c813255f00b087eb3548373777087e4d | |
| parent | 739b81abfab4edcd84e29019a6f73c519f678dbd [diff] | |
| parent | 65b1230ea9829246d2bc8073974440a3a49af55c [diff] |
am 65b1230e: (-s ours) am 66daca6b: Import translations. DO NOT MERGE * commit '65b1230ea9829246d2bc8073974440a3a49af55c': Import translations. DO NOT MERGE