| commit | 18446cb185ba29a300c0d3d7a20b86a318c2939f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:43:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:43:04 2014 +0000 |
| tree | 675b4626dd6674f2bce9acda4973c36eee48e4ea | |
| parent | d3eee336d68bf44aba42a834bdf76a8fa1c8f5e8 [diff] | |
| parent | b266393ecde6ec273209cfde4c062d9e267eb935 [diff] |
am b266393e: (-s ours) am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b266393ecde6ec273209cfde4c062d9e267eb935': Import translations. DO NOT MERGE