commit | bba150b6fc733847a04014abb22624c2c9456025 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Mar 20 18:50:37 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 18:50:37 2014 +0000 |
tree | 1d279871a5b170d7f405dfb337d3971937730db1 | |
parent | a321f5274b2fbb45932908690a84342ce63de453 [diff] | |
parent | febf1b9c39c109c23297787dfc5fc0476e184c41 [diff] |
am febf1b9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly * commit 'febf1b9c39c109c23297787dfc5fc0476e184c41': Import translations. DO NOT MERGE