| commit | 2fe1ea16ef13c539d626ff6d801d7f8576cabaa6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:42:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:42:29 2014 +0000 |
| tree | eb8c2679596612dd8171ec27d01a206048459f44 | |
| parent | ca389b259f24f5219db631dde4f50511ffe4253e [diff] | |
| parent | ad9889bbd92454d960c638da04fa6a649bc3f6ef [diff] |
am ad9889bb: (-s ours) am 3efcd8da: (-s ours) am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ad9889bbd92454d960c638da04fa6a649bc3f6ef': Import translations. DO NOT MERGE