| commit | 99816c1d6e6cd42888ef1c62ac9974e14e244e5f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 15:26:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 15:26:28 2014 +0000 |
| tree | 51816b3d624d2d749d7fcf0f7e3f369e27727164 | |
| parent | 290c7379f93ead6c2ed0995fb29eceed22d6d7ab [diff] | |
| parent | e48121ed5f3a6edf1bd988951e8845a2ab100472 [diff] |
am e48121ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'e48121ed5f3a6edf1bd988951e8845a2ab100472': Import translations. DO NOT MERGE