| commit | 10fa1c14df952df14f3c7b181cbcc773dc213565 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jan 22 16:39:19 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 22 16:39:19 2013 -0800 |
| tree | 00ce9d381bf17f1fb77beb83b4d25233a083b3fd | |
| parent | 4576325cdd9751be23c4804a8838c0ca6cb8a639 [diff] | |
| parent | 6c6317a8ca7a5233bf250d2428cfa29ee859ba02 [diff] |
am 6c6317a8: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6c6317a8ca7a5233bf250d2428cfa29ee859ba02': Import translations. DO NOT MERGE