| commit | 2ecb976b97f5486e066e7fd77f2c8fedc6327634 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 17 16:26:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 16:26:02 2014 +0000 |
| tree | 5bc29aea0871111f47665f3ff520ae93786e5d65 | |
| parent | c87ab340e3b528fbcb68ab691785c958ff590bad [diff] | |
| parent | 5c6d6c38e386cc3986c89ab91b64d947dce41995 [diff] |
am 5c6d6c38: (-s ours) am dafd9fc8: (-s ours) Import translations. DO NOT MERGE * commit '5c6d6c38e386cc3986c89ab91b64d947dce41995': Import translations. DO NOT MERGE