| commit | 28439f261b178758a985b8eb78e408e643fd1057 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 19:40:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 19:40:59 2015 +0000 |
| tree | 4b9829981f69c6da7c0d31a28c76272d27bfbe51 | |
| parent | 47a0e664b86b3584e294fd326f5c776b73f2e25a [diff] | |
| parent | 615adb8bc80efa8c4b6d45387a500e8ab77bc692 [diff] |
am 615adb8b: (-s ours) am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '615adb8bc80efa8c4b6d45387a500e8ab77bc692': Import translations. DO NOT MERGE