| commit | 13f57b848c99a9dc3535a13059d50e421a9f6697 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 15:28:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 15:28:03 2014 +0000 |
| tree | 34950a60d3eb6fbad31e57c3155547782c1a843d | |
| parent | 1464dd2f925f4b6179a7ede287f13431e6835aec [diff] | |
| parent | 0de823704d94d9e9e5cceccf4573afed4fd66b28 [diff] |
am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '0de823704d94d9e9e5cceccf4573afed4fd66b28': Import translations. DO NOT MERGE