| commit | e8e6b933a73f7ff23bd6c0880cc6d9b82bd4ec9e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 19:48:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 19:48:07 2014 +0000 |
| tree | 26cfd153e7e4ee00eafb8decfd53dafd71db48c4 | |
| parent | 65588053164fd51a69c5110c1e75c8712cd69e2c [diff] | |
| parent | c81a3e16e77c83d30395d36dc907cbef80dd7ac6 [diff] |
am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'c81a3e16e77c83d30395d36dc907cbef80dd7ac6': Import translations. DO NOT MERGE