| commit | a9e131ce28129f3a3db8d6d03eb69e1ce6836bb5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 17:56:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 17:56:38 2014 +0000 |
| tree | 787455ab789ccdf1e4b629ab8f0dc334b04da4c9 | |
| parent | fe6cde379a7b086032877917c0ee0e64bf7e9e57 [diff] | |
| parent | c218d8f19881deed098875e2caf41b7ca9e42133 [diff] |
am c218d8f1: (-s ours) am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c218d8f19881deed098875e2caf41b7ca9e42133': Import translations. DO NOT MERGE