| commit | 31b7b4c889df0fd863a83e4f9b5d9978ba000526 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 00:07:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 00:07:21 2014 +0000 |
| tree | 703c599aa3e7046603068031d8bade8ef86a1228 | |
| parent | 0b13d1c45d23fd4632c9cb33b080a8e3242fd6b6 [diff] | |
| parent | 62ef21054c63b40f18c8844a9b2ab5d2f9702d86 [diff] |
am 62ef2105: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '62ef21054c63b40f18c8844a9b2ab5d2f9702d86': Import translations. DO NOT MERGE