| commit | 0f42fe23abd20663cc1e0ea4cfce8b4f6ed09c13 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Aug 05 13:25:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 05 13:25:49 2014 +0000 |
| tree | d8e1551af7f525c772cdde483f521a399a8dc17a | |
| parent | 14ce6f35e4fb79c71a90e9b2cb6ff77e8c73e41e [diff] | |
| parent | c8e35f487e173f280a3f3bd96f5b42b7e778d403 [diff] |
am c8e35f48: (-s ours) am 7c366c7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c8e35f487e173f280a3f3bd96f5b42b7e778d403': Import translations. DO NOT MERGE