| commit | a8a49326cdf1fe9e2a00680d6f790d54b24bb847 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 06:22:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:22:53 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | 19f2e7b5620cad79e34e9020159eb4db399b8de1 [diff] | |
| parent | bd15704d42dea8e327fe0071a9a454e409680cf9 [diff] |
am bd15704d: (-s ours) am 5702f372: (-s ours) am f82c86c2: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'bd15704d42dea8e327fe0071a9a454e409680cf9':