| commit | c1c44c1bff8fcdc12b6815c87b5615dae31f9a9f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 01:48:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 01:48:57 2014 +0000 |
| tree | a4583c525dd13a1e51a3c070875b946a17d90085 | |
| parent | a2ac1ade830e71a4806186f5226bb9f956f668fb [diff] | |
| parent | 79469425a170b9f8af20153078fb20d6400beefa [diff] |
am 79469425: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '79469425a170b9f8af20153078fb20d6400beefa': Import translations. DO NOT MERGE