| commit | 69efcee6611666f4da215a6ebab7f091eaf5e55b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 20:56:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 20:56:09 2014 +0000 |
| tree | 01dfa156dcf5dbc7fb401c3d2e511b9e92db6318 | |
| parent | 3eebb50c279f17eb801a6ec8fbe7eac905156e76 [diff] | |
| parent | 16d00c4c15ea48d40104f36db7f1875b6eb17461 [diff] |
am 16d00c4c: (-s ours) Import translations. DO NOT MERGE * commit '16d00c4c15ea48d40104f36db7f1875b6eb17461': Import translations. DO NOT MERGE