| commit | a775601fddffd1ecce3ff387d2e70c849d46293c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 06 15:36:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 15:36:23 2014 +0000 |
| tree | 0c8b94cfd8f21c5a4d0acecc075783c6f31edfc2 | |
| parent | bd8c3085b118f82c840199849c2ef33404309a43 [diff] | |
| parent | cce4f6a5e0160d9bbb76ae4f9f453dd5861f27b3 [diff] |
am fbca9fef: (-s ours) am 066b42c7: (-s ours) Import translations. DO NOT MERGE * commit 'fbca9fefc1e75e5ec8522c694ca88dc5e834f48a': Import translations. DO NOT MERGE