| commit | de67d914d574c3d3d9918c7b3b375332ff72f372 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 06:21:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:21:33 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | 7de8d8acddb5e01853789c75c2eefdb3c2c13500 [diff] | |
| parent | ac0a155effbd9ca4c7f2bb721983a35f9a9b1968 [diff] |
am ac0a155e: (-s ours) am a834ade4: (-s ours) am e8f27a97: (-s ours) am 916421ca: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'ac0a155effbd9ca4c7f2bb721983a35f9a9b1968':