| commit | 301a617698e74bb413df52f93ea7908a33423250 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 15:17:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 15:17:58 2014 +0000 |
| tree | 9a172a5d66d6758f6efcdfbc00b6aec5902d2410 | |
| parent | b73e02cf5c736a944155b9d4586d8e8a6e40dc6e [diff] | |
| parent | d6fc7cf149795abdcd0629e229be52b816ee13c1 [diff] |
am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'd6fc7cf149795abdcd0629e229be52b816ee13c1': Import translations. DO NOT MERGE