| commit | 844e2a6a085efafa9370e5402968ee1cb76be7c7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 13 16:50:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 16:50:29 2014 +0000 |
| tree | 57c45e0bd1e86409708e013eaca53be3e6952209 | |
| parent | 3aa19006555e651dfc12d68d271247dbed8c6a39 [diff] | |
| parent | 5e0a4a4e8150caec3f28e0884ae95bf4e69b57dd [diff] |
am 5e0a4a4e: (-s ours) am f0bea657: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly * commit '5e0a4a4e8150caec3f28e0884ae95bf4e69b57dd': Import translations. DO NOT MERGE