| commit | 47ed949131ba9383a8328bc19b636c0864639c27 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Dec 17 23:45:38 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 17 23:45:38 2012 -0800 |
| tree | ac76b054dd2e2c2858f0e179c16b419f44247b89 | |
| parent | 530e58f91dda219a5c542129c00199ecbc09f630 [diff] | |
| parent | f4c123acaab757af6c18864ea00c5c027c2b47ee [diff] |
am f4c123ac: (-s ours) am fdfb676d: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'f4c123acaab757af6c18864ea00c5c027c2b47ee':