| commit | deb466201ae333fe343d7aefb69366eea8dbc48a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 10 17:17:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 17:17:33 2014 +0000 |
| tree | 771e96b8049f69a0d332cd8fbd8f56459fb31b9e | |
| parent | c4d9097b4afe848661fa2ddd735b63fd2afac433 [diff] | |
| parent | c0c9b129440122b05a7245b6b624e83e9be2f93d [diff] |
am c0c9b129: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'c0c9b129440122b05a7245b6b624e83e9be2f93d': Import translations. DO NOT MERGE