| commit | 9815e5ad92e47a2a23904ece53d5f6b10b82227e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:42:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:42:33 2014 +0000 |
| tree | eb8c2679596612dd8171ec27d01a206048459f44 | |
| parent | 2fe1ea16ef13c539d626ff6d801d7f8576cabaa6 [diff] | |
| parent | 2bf691436b828b2a71d3d9dc917a3b43adfed73d [diff] |
am 2bf69143: (-s ours) am cb3a6f89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '2bf691436b828b2a71d3d9dc917a3b43adfed73d': Import translations. DO NOT MERGE