| commit | 6e0372380c9cca90f9ffc49a72ee45a1f32dcb8c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 22:22:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 22:22:36 2014 +0000 |
| tree | c7ae4626c6c4a15fd6290f4ff3b2c4b5a7caa9b0 | |
| parent | 85a233f5080d9c69f719775f80d8f918d9513b50 [diff] | |
| parent | 18446cb185ba29a300c0d3d7a20b86a318c2939f [diff] |
am 18446cb1: (-s ours) am b266393e: (-s ours) am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '18446cb185ba29a300c0d3d7a20b86a318c2939f': Import translations. DO NOT MERGE