| commit | f5b097e04486d3d641d20573412a7371a8557525 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Feb 25 17:27:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 17:27:19 2015 +0000 |
| tree | dfa7bb9f144869f7fe6266887195fec9ddc1f040 | |
| parent | f8952681a54c399c1b784c23d550192d240e6220 [diff] | |
| parent | c88604bcb94ce23706767bf10db24ff23a68a4b5 [diff] |
am c88604bc: (-s ours) am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'c88604bcb94ce23706767bf10db24ff23a68a4b5': Import translations. DO NOT MERGE