| commit | 68fa35eb0ba3af31a334e7927ba8337e3e57bc83 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:42:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:42:38 2014 +0000 |
| tree | eb8c2679596612dd8171ec27d01a206048459f44 | |
| parent | 9815e5ad92e47a2a23904ece53d5f6b10b82227e [diff] | |
| parent | 20dd965559e535271866dde7a682733bde7749b9 [diff] |
am 20dd9655: (-s ours) am 9641feee: (-s ours) am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '20dd965559e535271866dde7a682733bde7749b9': Import translations. DO NOT MERGE