| commit | aa61163ed3f338de0583770be13b38a83f4da04b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 04 16:00:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 04 16:00:37 2014 +0000 |
| tree | e54691ce34ea697a2c86d2a2f1889fdc2416f051 | |
| parent | 2f3f55f383a59cc87a07bb11392e20e6a28ba2c9 [diff] | |
| parent | bcb9ec0dfabc2ae325885d6e9bea3bc7adb4e4c6 [diff] |
am f12c6aeb: (-s ours) Import translations. DO NOT MERGE * commit 'f12c6aeb73b0e3df29de4e2d787d1ae65e5300ce': Import translations. DO NOT MERGE