commit | 7de8d8acddb5e01853789c75c2eefdb3c2c13500 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sat Jan 31 06:21:32 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:21:32 2015 +0000 |
tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
parent | 623bf6b6127a872d28dd929dd8f95f54ca9cd763 [diff] | |
parent | 19e93807dc1784f535a1c0b29bcbecd6093fd34d [diff] |
am 19e93807: (-s ours) am 038707b4: (-s ours) am ce2e385c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-master * commit '19e93807dc1784f535a1c0b29bcbecd6093fd34d':