| commit | a8955e768a54cc7787c2712b0a830de30d5fad5f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Oct 18 16:37:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 18 16:37:28 2014 +0000 |
| tree | f9466ea7b3bdc409b0611b77f05e6a55b6a5ea1f | |
| parent | 824be94f31cfbb7f09bc3999bb44b084cff3ab45 [diff] | |
| parent | e81650071c84436cd996f73d40ad074c43782a32 [diff] |
am e8165007: (-s ours) am 1dd8d00b: (-s ours) am 6317598a: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'e81650071c84436cd996f73d40ad074c43782a32': Import translations. DO NOT MERGE