| commit | f82c86c26c0ba9896b61270b48a8e4f82d7d7fde | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Sep 29 03:00:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 29 03:00:44 2014 +0000 |
| tree | 83b461d1a1cae531068c9d2fcf23757554762f79 | |
| parent | fdff96d385fdbbcb1d0a49853e89d60211a48cc7 [diff] | |
| parent | 1004713867fa4476201c02c95f35c64361a6dcf2 [diff] |
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '1004713867fa4476201c02c95f35c64361a6dcf2': Import translations. DO NOT MERGE