| commit | 78fa1e56ff25ce496035c9540b729ec9c034dc6c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 12 16:22:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 12 16:22:54 2015 +0000 |
| tree | 05930c1d89572c46084ea88c1b63f456ec58f9c5 | |
| parent | 5cf0d543ec7d90f05e4fb4f146021e811014ea4c [diff] | |
| parent | 7f8c883e2127be16b0133b1ac229f7d73ffe5bf1 [diff] |
am 7f8c883e: (-s ours) Import translations. DO NOT MERGE * commit '7f8c883e2127be16b0133b1ac229f7d73ffe5bf1': Import translations. DO NOT MERGE