| commit | 1b1a08fdb8675f233a9f0f4d5d42aea87770b174 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 14 19:24:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 19:24:21 2015 +0000 |
| tree | 7bff683fd37205ce15ed6d48e77296822b61aa3a | |
| parent | 7b62336f26bc5966080e8153690da4fa28f5adf3 [diff] | |
| parent | 9b07944c5007460b8c6792321e5db1350ec3ff55 [diff] |
am 9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '9b07944c5007460b8c6792321e5db1350ec3ff55': Import translations. DO NOT MERGE